traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move initialization of interned strings to before allocating the 

object so we don't leak op.  (Fixes an earlier patch to this code)

Klockwork #350
This commit is contained in:
Neal Norwitz 2006-08-19 04:19:14 +00:00
parent 03ee62c352
commit 3ba24783ba
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Objects/classobject.c
View File

@ -91,8 +91,22 @@ PyClass_New(PyObject *bases, PyObject *dict, PyObject *name)
} }
Py_INCREF(bases); Py_INCREF(bases);
} }
if (getattrstr == NULL) {
getattrstr = PyString_InternFromString("__getattr__");
if (getattrstr == NULL)
goto alloc_error;
setattrstr = PyString_InternFromString("__setattr__");
if (setattrstr == NULL)
goto alloc_error;
delattrstr = PyString_InternFromString("__delattr__");
if (delattrstr == NULL)
goto alloc_error;
}
op = PyObject_GC_New(PyClassObject, &PyClass_Type); op = PyObject_GC_New(PyClassObject, &PyClass_Type);
if (op == NULL) { if (op == NULL) {
alloc_error:
Py_DECREF(bases); Py_DECREF(bases);
return NULL; return NULL;
} }
@ -101,17 +115,7 @@ PyClass_New(PyObject *bases, PyObject *dict, PyObject *name)
op->cl_dict = dict; op->cl_dict = dict;
Py_XINCREF(name); Py_XINCREF(name);
op->cl_name = name; op->cl_name = name;
if (getattrstr == NULL) {
getattrstr = PyString_InternFromString("__getattr__");
if (getattrstr == NULL)
return NULL;
setattrstr = PyString_InternFromString("__setattr__");
if (setattrstr == NULL)
return NULL;
delattrstr = PyString_InternFromString("__delattr__");
if (delattrstr == NULL)
return NULL;
}
op->cl_getattr = class_lookup(op, getattrstr, &dummy); op->cl_getattr = class_lookup(op, getattrstr, &dummy);
op->cl_setattr = class_lookup(op, setattrstr, &dummy); op->cl_setattr = class_lookup(op, setattrstr, &dummy);
op->cl_delattr = class_lookup(op, delattrstr, &dummy); op->cl_delattr = class_lookup(op, delattrstr, &dummy);