[Python-checkins] r67801 - in python/branches/release26-maint: Lib/test/test_hotshot.py Misc/NEWS Modules/_hotshot.c

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Mon Dec 15 23:16:00 2008
New Revision: 67801

Log:
Merged revisions 67797 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67797 | amaury.forgeotdarc | 2008-12-15 22:47:57 +0100 (Mon, 15 Dec 2008) | 4 lines
  
  #3954: Fix error handling code in _hotshot.logreader
  
  Will port to 2.6. hotshot was deleted from python 3.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_hotshot.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/_hotshot.c

Modified: python/branches/release26-maint/Lib/test/test_hotshot.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_hotshot.py	(original)
+++ python/branches/release26-maint/Lib/test/test_hotshot.py	Mon Dec 15 23:16:00 2008
@@ -3,6 +3,8 @@
 import os
 import pprint
 import unittest
+import _hotshot
+import gc
 
 from test import test_support
 
@@ -124,6 +126,10 @@
             if os.path.exists(test_support.TESTFN):
                 os.remove(test_support.TESTFN)
 
+    def test_logreader_eof_error(self):
+        self.assertRaises((IOError, EOFError), _hotshot.logreader, ".")
+        gc.collect()
+
 def test_main():
     test_support.run_unittest(HotShotTestCase)
 

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Mon Dec 15 23:16:00 2008
@@ -32,6 +32,9 @@
 Library
 -------
 
+- Issue #3954: Fix a potential SystemError in _hotshot.logreader error
+  handling.
+
 - Issue #4574: fix a crash in io.IncrementalNewlineDecoder when a carriage
   return encodes to more than one byte in the source encoding (e.g. UTF-16)
   and gets split on a chunk boundary.

Modified: python/branches/release26-maint/Modules/_hotshot.c
==============================================================================
--- python/branches/release26-maint/Modules/_hotshot.c	(original)
+++ python/branches/release26-maint/Modules/_hotshot.c	Mon Dec 15 23:16:00 2008
@@ -1357,20 +1357,16 @@
             self->logfp = fopen(filename, "rb");
             if (self->logfp == NULL) {
                 PyErr_SetFromErrnoWithFilename(PyExc_IOError, filename);
-                Py_DECREF(self);
-                self = NULL;
-                goto finally;
+                goto error;
             }
             self->info = PyDict_New();
-            if (self->info == NULL) {
-                Py_DECREF(self);
-                goto finally;
-            }
+            if (self->info == NULL)
+                goto error;
             /* read initial info */
             for (;;) {
                 if ((c = fgetc(self->logfp)) == EOF) {
                     eof_error(self);
-                    break;
+                    goto error;
                 }
                 if (c != WHAT_ADD_INFO) {
                     ungetc(c, self->logfp);
@@ -1383,13 +1379,15 @@
                     else
                         PyErr_SetString(PyExc_RuntimeError,
                                         "unexpected error");
-                    break;
+                    goto error;
                 }
             }
         }
     }
- finally:
     return (PyObject *) self;
+  error:
+    Py_DECREF(self);
+    return NULL;
 }