mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

EnvironmentError__init__(): The two case clauses were missing

Browse source 
`break's.  This first missing break caused a memory leak when case 3
fell through case 2 in the following example:

import os
os.chmod('/missing', 0600)
This commit is contained in:
Barry Warsaw 2000-07-09 04:56:25 +00:00
parent 4288c80599
commit 7dfeb42939
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/exceptions.c
View file

@ -440,8 +440,10 @@ EnvironmentError__init__(PyObject* self, PyObject* args)
switch (PySequence_Length(args)) { switch (PySequence_Length(args)) {
case 3: case 3:
/* open() errors give third argument which is the filename. But so /* Where a function has a single filename, such as open() or some
* common in-place unpacking doesn't break, e.g.: * of the os module functions, PyErr_SetFromErrnoWithFilename() is
* called, giving a third argument which is the filename. But, so
* that old code using in-place unpacking doesn't break, e.g.:
* *
* except IOError, (errno, strerror): * except IOError, (errno, strerror):
* *
@ -465,9 +467,12 @@ EnvironmentError__init__(PyObject* self, PyObject* args)
subslice = PySequence_GetSlice(args, 0, 2); subslice = PySequence_GetSlice(args, 0, 2);
if (!subslice || PyObject_SetAttrString(self, "args", subslice)) if (!subslice || PyObject_SetAttrString(self, "args", subslice))
goto finally; goto finally;
break;
case 2: case 2:
/* common case: PyErr_SetFromErrno() */ /* Used when PyErr_SetFromErrno() is called and no filename
* argument is given.
*/
item0 = PySequence_GetItem(args, 0); item0 = PySequence_GetItem(args, 0);
item1 = PySequence_GetItem(args, 1); item1 = PySequence_GetItem(args, 1);
if (!item0 || !item1) if (!item0 || !item1)
@ -478,6 +483,7 @@ EnvironmentError__init__(PyObject* self, PyObject* args)
{ {
goto finally; goto finally;
} }
break;
} }
Py_INCREF(Py_None); Py_INCREF(Py_None);