diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2008-08-24 22:03:05 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2008-08-24 22:03:05 (GMT) |
| commit | 901e4715bd50bd96469c7fea8c9ed22e61ff6028 (patch) | |
| tree | ceb84aedaa2be351f3776577812f7d92c5befa63 | |
| parent | dcf48912102e3caa6f00a06ebc0a80867ec795b8 (diff) | |
| download | cpython-901e4715bd50bd96469c7fea8c9ed22e61ff6028.zip cpython-901e4715bd50bd96469c7fea8c9ed22e61ff6028.tar.gz cpython-901e4715bd50bd96469c7fea8c9ed22e61ff6028.tar.bz2 | |
#3662: Fix segfault introduced when fixing memory leaks.
TESTED=./python -E -tt ./Lib/test/regrtest.py test_fileio
R (approach from bug)=Amaury and Benjamin
| -rw-r--r-- | Lib/test/test_fileio.py | 4 | ||||
| -rw-r--r-- | Modules/_fileio.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index 9f70a73..a8b15fa 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -227,6 +227,10 @@ class OtherFileTests(unittest.TestCase): except: pass + def testInvalidInit(self): + self.assertRaises(TypeError, _fileio._FileIO, "1", 0, 0) + + def test_main(): # Historically, these tests have been sloppy about removing TESTFN. # So get rid of it no matter what. diff --git a/Modules/_fileio.c b/Modules/_fileio.c index 6b3a98d..d6f004f 100644 --- a/Modules/_fileio.c +++ b/Modules/_fileio.c @@ -175,7 +175,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) kwlist, Py_FileSystemDefaultEncoding, &name, &mode, &closefd)) - goto error; + return -1; } } |