sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

Check types of dictionary elements in to_struct()

Browse Source
This commit is contained in:
Tim Potter -
parent e5dcd3c7cc
commit 793f1042f1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/python/py_conv.c
View File

@ -99,9 +99,10 @@ BOOL to_struct(void *s, PyObject *dict, struct pyconv *conv)
UNISTR *u = (UNISTR *)((char *)s + conv[i].offset);
char *s = "";
if (obj && PyString_Check(obj))
s = PyString_AsString(obj);
if (!PyString_Check(obj))
goto done;
s = PyString_AsString(obj);
init_unistr(u, s);
break;
@ -109,21 +110,20 @@ BOOL to_struct(void *s, PyObject *dict, struct pyconv *conv)
case PY_UINT32: {
uint32 *u = (uint32 *)((char *)s + conv[i].offset);
if (obj && PyInt_Check(obj))
if (!PyInt_Check(obj))
goto done;
*u = PyInt_AsLong(obj);
else
*u = 0;
break;
}
case PY_UINT16: {
uint16 *u = (uint16 *)((char *)s + conv[i].offset);
if (obj && PyInt_Check(obj))
*u = PyInt_AsLong(obj);
else
*u = 0;
if (!PyInt_Check(obj))
goto done;
*u = PyInt_AsLong(obj);
break;
}
default: