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

don't allow putval of None

Browse Source
This commit is contained in:
Michael Davidsaver
2013-06-02 18:43:08 -04:00
parent a432a0fc26
commit ab5dea3bf0
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
devsupApp/src/dbfield.c
View File

@ -105,6 +105,13 @@ static PyObject* pyField_putval(pyField *self, PyObject* args)
if(!PyArg_ParseTuple(args, "O", &val))
return NULL;
if(val==Py_None) {
PyErr_Format(PyExc_ValueError, "Can't assign None to %s.%s",
self->addr.precord->name,
self->addr.pfldDes->name);
return NULL;
}
switch(self->addr.field_type)
{
#define OP(FTYPE, CTYPE, FN) case DBF_##FTYPE: *(CTYPE*)self->addr.pfield = FN(val); break
@ -130,8 +137,12 @@ static PyObject* pyField_putval(pyField *self, PyObject* args)
#else
fld = PyString_AsString(val);
#endif
strncpy(dest, fld, MAX_STRING_SIZE);
dest[MAX_STRING_SIZE-1]='\0';
if(fld) {
strncpy(dest, fld, MAX_STRING_SIZE);
dest[MAX_STRING_SIZE-1]='\0';
} else {
dest[0] = '\0';
}
#if PY_MAJOR_VERSION >= 3
Py_DECREF(data);
#endif