mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: check return value of Python object functions (RHBZ#1406906)

Browse Source 
Verify the returned values of Python Object constructor functions
are not NULL before adding them to a collection.

This is particularly relevant when constructing Unicode strings in
Python 3 as they will return NULL if non UTF-8 characters are present.

Signed-off-by: Matteo Cafasso <noxdafox@gmail.com>
This commit is contained in:
Matteo Cafasso
2017-05-11 21:21:39 +03:00
committed by Pino Toscano
parent 4ce26d8f21
commit 401c445636
3 changed files with 156 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
python/handle.c
View File

@@ -324,15 +324,23 @@ guestfs_int_py_get_string_list (PyObject *obj)
PyObject *
guestfs_int_py_put_string_list (char * const * const argv)
{
PyObject *list;
PyObject *list, *item;
size_t argc, i;
for (argc = 0; argv[argc] != NULL; ++argc)
;
list = PyList_New (argc);
if (list == NULL)
return NULL;
for (i = 0; i < argc; ++i) {
PyList_SetItem (list, i, guestfs_int_py_fromstring (argv[i]));
item = guestfs_int_py_fromstring (argv[i]);
if (item == NULL) {
Py_CLEAR (list);
return NULL;
}
PyList_SetItem (list, i, item);
}
return list;
@@ -341,21 +349,35 @@ guestfs_int_py_put_string_list (char * const * const argv)
PyObject *
guestfs_int_py_put_table (char * const * const argv)
{
PyObject *list, *item;
PyObject *list, *tuple, *item;
size_t argc, i;
for (argc = 0; argv[argc] != NULL; ++argc)
;
list = PyList_New (argc >> 1);
if (list == NULL)
return NULL;
for (i = 0; i < argc; i += 2) {
item = PyTuple_New (2);
PyTuple_SetItem (item, 0, guestfs_int_py_fromstring (argv[i]));
PyTuple_SetItem (item, 1, guestfs_int_py_fromstring (argv[i+1]));
PyList_SetItem (list, i >> 1, item);
tuple = PyTuple_New (2);
if (tuple == NULL)
goto err;
item = guestfs_int_py_fromstring (argv[i]);
if (item == NULL)
goto err;
PyTuple_SetItem (tuple, 0, item);
item = guestfs_int_py_fromstring (argv[i+1]);
if (item == NULL)
goto err;
PyTuple_SetItem (tuple, 1, item);
PyList_SetItem (list, i >> 1, tuple);
}
return list;
err:
Py_CLEAR (list);
Py_CLEAR (tuple);
return NULL;
}
PyObject *