lin-epics-modules/pyDevSup
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dbrec: improper use of DBENTRY

Browse Source 
use of DBENTRY after free and leak of same
This commit is contained in:
Michael Davidsaver
2015-01-04 09:20:44 -05:00
parent 325fb87496
commit 7d527103bf
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
devsupApp/src/dbrec.c
View File

@ -73,25 +73,24 @@ static PyObject* pyRecord_rtype(pyRecord *self)
static PyObject* pyRecord_info(pyRecord *self, PyObject *args) static PyObject* pyRecord_info(pyRecord *self, PyObject *args)
{ {
long ret;
const char *name; const char *name;
PyObject *def = NULL; PyObject *ret = NULL;
DBENTRY entry; DBENTRY entry;
if(!PyArg_ParseTuple(args, "s|O", &name, &def)) if(!PyArg_ParseTuple(args, "s|O", &name, &ret))
return NULL; return NULL;
Py_XINCREF(ret);
dbCopyEntryContents(&self->entry, &entry); dbCopyEntryContents(&self->entry, &entry);
ret = dbFindInfo(&entry, name); if(!dbFindInfo(&entry, name)) {
Py_XDECREF(ret);
ret = PyString_FromString(dbGetInfoString(&entry));
}
dbFinishEntry(&entry); dbFinishEntry(&entry);
if(!ret) if(!ret)
return PyString_FromString(dbGetInfoString(&entry));
Py_XINCREF(def);
if(!def)
PyErr_SetNone(PyExc_KeyError); PyErr_SetNone(PyExc_KeyError);
return def; return ret;
} }
static PyObject* pyRecord_infos(pyRecord *self) static PyObject* pyRecord_infos(pyRecord *self)
@ -117,6 +116,8 @@ static PyObject* pyRecord_infos(pyRecord *self)
} }
} }
dbFinishEntry(&entry);
return dict; return dict;
} }