sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

Merge of argument check fixes from HEAD.

Browse Source 
(This used to be commit 5ea2edaadd87c24f63991678183c5d01225eabf7)
This commit is contained in:
Tim Potter 2002-11-29 01:11:08 +00:00
parent 531ecf607a
commit 9fe17afefe
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source3/python/py_spoolss_printers_conv.c
View File

@ -217,10 +217,8 @@ BOOL py_to_PRINTER_INFO_1(PRINTER_INFO_1 *info, PyObject *dict)
PyObject *obj, *dict_copy = PyDict_Copy(dict);
BOOL result = False;
if (!(obj = PyDict_GetItemString(dict_copy, "level")))
goto done;
if (!PyInt_Check(obj))
if (!(obj = PyDict_GetItemString(dict_copy, "level")) ||
!PyInt_Check(obj))
goto done;
PyDict_DelItemString(dict_copy, "level");
@ -272,25 +270,25 @@ BOOL py_to_PRINTER_INFO_2(PRINTER_INFO_2 *info, PyObject *dict,
PyObject *obj, *dict_copy = PyDict_Copy(dict);
BOOL result = False;
/* Convert security descriptor */
/* Convert security descriptor - may be NULL */
if (!(obj = PyDict_GetItemString(dict_copy, "security_descriptor")))
goto done;
info->secdesc = NULL;
if (!PyDict_Check(obj))
goto done;
if ((obj = PyDict_GetItemString(dict_copy, "security_descriptor"))) {
if (!py_to_SECDESC(&info->secdesc, obj, mem_ctx))
goto done;
if (!PyDict_Check(obj))
goto done;
PyDict_DelItemString(dict_copy, "security_descriptor");
if (!py_to_SECDESC(&info->secdesc, obj, mem_ctx))
goto done;
PyDict_DelItemString(dict_copy, "security_descriptor");
}
/* Convert device mode */
if (!(obj = PyDict_GetItemString(dict_copy, "device_mode")))
goto done;
if (!PyDict_Check(obj))
if (!(obj = PyDict_GetItemString(dict_copy, "device_mode"))
|| !PyDict_Check(obj))
goto done;
info->devmode = talloc(mem_ctx, sizeof(DEVICEMODE));
@ -300,6 +298,14 @@ BOOL py_to_PRINTER_INFO_2(PRINTER_INFO_2 *info, PyObject *dict,
PyDict_DelItemString(dict_copy, "device_mode");
/* Check info level */
if (!(obj = PyDict_GetItemString(dict_copy, "level")) ||
!PyInt_Check(obj))
goto done;
PyDict_DelItemString(dict_copy, "level");
/* Convert remaining elements of dictionary */
if (!to_struct(info, dict_copy, py_PRINTER_INFO_2))