From 771fc528ebf3ea6d8580b76449df974c4492aae5 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Mon, 21 Oct 2002 04:47:29 +0000 Subject: More cleanups of validation functions. (This used to be commit a4790ba42cc6ee4086dafbc64b1dba790a6c3583) --- source3/python/py_spoolss_forms_conv.c | 5 ++ source3/python/py_spoolss_printers_conv.c | 80 +++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 19 deletions(-) (limited to 'source3') diff --git a/source3/python/py_spoolss_forms_conv.c b/source3/python/py_spoolss_forms_conv.c index cfeb475b1e..095a318fd2 100644 --- a/source3/python/py_spoolss_forms_conv.c +++ b/source3/python/py_spoolss_forms_conv.c @@ -74,6 +74,11 @@ BOOL py_to_FORM(FORM *form, PyObject *dict) if (!to_struct(form, dict_copy, py_FORM)) goto done; + /* Careful! We can't call PyString_AsString(obj) then delete + obj and still expect to have our pointer pointing somewhere + useful. */ + + obj = PyDict_GetItemString(dict, "name"); name = PyString_AsString(obj); init_unistr2(&form->name, name, strlen(name) + 1); diff --git a/source3/python/py_spoolss_printers_conv.c b/source3/python/py_spoolss_printers_conv.c index 9bef118f2b..3e3ef95b12 100644 --- a/source3/python/py_spoolss_printers_conv.c +++ b/source3/python/py_spoolss_printers_conv.c @@ -161,18 +161,28 @@ BOOL py_from_DEVICEMODE(PyObject **dict, DEVICEMODE *devmode) BOOL py_to_DEVICEMODE(DEVICEMODE *devmode, PyObject *dict) { - PyObject *obj; + PyObject *obj, *dict_copy = PyDict_Copy(dict); + BOOL result = False; - if (!to_struct(devmode, dict, py_DEVICEMODE)) - return False; + if (!(obj = PyDict_GetItemString(dict_copy, "private"))) + goto done; - if (!(obj = PyDict_GetItemString(dict, "private"))) - return False; + if (!PyString_Check(obj)) + goto done; devmode->private = PyString_AsString(obj); devmode->driverextra = PyString_Size(obj); - return True; + PyDict_DelItemString(dict_copy, "private"); + + if (!to_struct(devmode, dict_copy, py_DEVICEMODE)) + goto done; + + result = True; + +done: + Py_DECREF(dict_copy); + return result; } /* @@ -204,12 +214,23 @@ BOOL py_from_PRINTER_INFO_1(PyObject **dict, PRINTER_INFO_1 *info) BOOL py_to_PRINTER_INFO_1(PRINTER_INFO_1 *info, PyObject *dict) { - PyObject *dict_copy = PyDict_Copy(dict); - BOOL result; + PyObject *obj, *dict_copy = PyDict_Copy(dict); + BOOL result = False; + + if (!(obj = PyDict_GetItemString(dict_copy, "level"))) + goto done; + + if (!PyInt_Check(obj)) + goto done; PyDict_DelItemString(dict_copy, "level"); - result = to_struct(info, dict_copy, py_PRINTER_INFO_1); + if (!to_struct(info, dict_copy, py_PRINTER_INFO_1)) + goto done; + + result = True; + +done: Py_DECREF(dict_copy); return result; } @@ -248,26 +269,47 @@ BOOL py_from_PRINTER_INFO_2(PyObject **dict, PRINTER_INFO_2 *info) BOOL py_to_PRINTER_INFO_2(PRINTER_INFO_2 *info, PyObject *dict, TALLOC_CTX *mem_ctx) { - PyObject *obj; + PyObject *obj, *dict_copy = PyDict_Copy(dict); + BOOL result = False; - if (!to_struct(info, dict, py_PRINTER_INFO_2)) - return False; + /* Convert security descriptor */ - if (!(obj = PyDict_GetItemString(dict, "security_descriptor"))) - return False; + if (!(obj = PyDict_GetItemString(dict_copy, "security_descriptor"))) + goto done; + + if (!PyDict_Check(obj)) + goto done; if (!py_to_SECDESC(&info->secdesc, obj, mem_ctx)) - return False; + goto done; - if (!(obj = PyDict_GetItemString(dict, "device_mode"))) - return False; + PyDict_DelItemString(dict_copy, "security_descriptor"); + + /* Convert device mode */ + + if (!(obj = PyDict_GetItemString(dict_copy, "device_mode"))) + goto done; + + if (!PyDict_Check(obj)) + goto done; info->devmode = talloc(mem_ctx, sizeof(DEVICEMODE)); if (!py_to_DEVICEMODE(info->devmode, obj)) - return False; + goto done; - return True; + PyDict_DelItemString(dict_copy, "device_mode"); + + /* Convert remaining elements of dictionary */ + + if (!to_struct(info, dict_copy, py_PRINTER_INFO_2)) + goto done; + + result = True; + +done: + Py_DECREF(dict_copy); + return result; } /* -- cgit