Changeset 3650

Timestamp:

26/10/08 19:18:43 (2 months ago)

Author:

dmeyer

Message:

prevent bad files from using too much IO

Files:

• trunk/metadata/src/factory.py (modified) (2 diffs)

trunk/metadata/src/factory.py

@@ -87 +87 @@
         raise core.ParseError
 
+class File(file):
+
+    def read(self, bytes=0):
+        if bytes <= 0 or bytes > 1000000:
+            # reading more than 1MB looks like a bug
+            raise IOError('trying to read %s bytes' % bytes)
+        return super(File, self).read(bytes)
 
 class _Factory:
@@ -266 +273 @@
         if os.path.isfile(filename):
             try:
-                f = open(filename,'rb')
+                f = File(filename,'rb')
             except (IOError, OSError), e:
                 log.info('error reading %s: %s' % (filename, e))