[Python-checkins] cpython (3.3): Issue #20331: Fixed possible FD leaks in various modules:

Sat Jan 25 18:44:11 CET 2014

http://hg.python.org/cpython/rev/2766320bdb10
changeset: 88702:2766320bdb10
branch: 3.3
parent: 88692:900a1ff323bb
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sat Jan 25 19:43:02 2014 +0200
summary:
 Issue #20331: Fixed possible FD leaks in various modules:
http.server, imghdr, mailcap, mimetypes, xml.etree.
files:
 Lib/http/server.py | 24 +++++++++++++-------
 Lib/imghdr.py | 20 +++++++---------
 Lib/mailcap.py | 4 +-
 Lib/mimetypes.py | 7 +++--
 Lib/xml/etree/ElementInclude.py | 9 +++----
 5 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/Lib/http/server.py b/Lib/http/server.py
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -670,8 +670,10 @@
 """Serve a GET request."""
 f = self.send_head()
 if f:
- self.copyfile(f, self.wfile)
- f.close()
+ try:
+ self.copyfile(f, self.wfile)
+ finally:
+ f.close()
 
 def do_HEAD(self):
 """Serve a HEAD request."""
@@ -712,13 +714,17 @@
 except IOError:
 self.send_error(404, "File not found")
 return None
- self.send_response(200)
- self.send_header("Content-type", ctype)
- fs = os.fstat(f.fileno())
- self.send_header("Content-Length", str(fs[6]))
- self.send_header("Last-Modified", self.date_time_string(fs.st_mtime))
- self.end_headers()
- return f
+ try:
+ self.send_response(200)
+ self.send_header("Content-type", ctype)
+ fs = os.fstat(f.fileno())
+ self.send_header("Content-Length", str(fs[6]))
+ self.send_header("Last-Modified", self.date_time_string(fs.st_mtime))
+ self.end_headers()
+ return f
+ except:
+ f.close()
+ raise
 
 def list_directory(self, path):
 """Helper to produce a directory listing (absent index.html).
diff --git a/Lib/imghdr.py b/Lib/imghdr.py
--- a/Lib/imghdr.py
+++ b/Lib/imghdr.py
@@ -7,18 +7,16 @@
 #-------------------------#
 
 def what(file, h=None):
- if h is None:
- if isinstance(file, str):
- f = open(file, 'rb')
- h = f.read(32)
- else:
- location = file.tell()
- h = file.read(32)
- file.seek(location)
- f = None
- else:
- f = None
+ f = None
 try:
+ if h is None:
+ if isinstance(file, str):
+ f = open(file, 'rb')
+ h = f.read(32)
+ else:
+ location = file.tell()
+ h = file.read(32)
+ file.seek(location)
 for tf in tests:
 res = tf(h, f)
 if res:
diff --git a/Lib/mailcap.py b/Lib/mailcap.py
--- a/Lib/mailcap.py
+++ b/Lib/mailcap.py
@@ -22,8 +22,8 @@
 fp = open(mailcap, 'r')
 except IOError:
 continue
- morecaps = readmailcapfile(fp)
- fp.close()
+ with fp:
+ morecaps = readmailcapfile(fp)
 for key, value in morecaps.items():
 if not key in caps:
 caps[key] = value
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -363,9 +363,10 @@
 f = open(file)
 except IOError:
 return None
- db = MimeTypes()
- db.readfp(f, True)
- return db.types_map[True]
+ with f:
+ db = MimeTypes()
+ db.readfp(f, True)
+ return db.types_map[True]
 
 
 def _default_mime_types():
diff --git a/Lib/xml/etree/ElementInclude.py b/Lib/xml/etree/ElementInclude.py
--- a/Lib/xml/etree/ElementInclude.py
+++ b/Lib/xml/etree/ElementInclude.py
@@ -76,14 +76,13 @@
 
 def default_loader(href, parse, encoding=None):
 if parse == "xml":
- file = open(href, 'rb')
- data = ElementTree.parse(file).getroot()
+ with open(href, 'rb') as file:
+ data = ElementTree.parse(file).getroot()
 else:
 if not encoding:
 encoding = 'UTF-8'
- file = open(href, 'r', encoding=encoding)
- data = file.read()
- file.close()
+ with open(href, 'r', encoding=encoding) as file:
+ data = file.read()
 return data
 
 ##
-- 
Repository URL: http://hg.python.org/cpython
