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

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>

python/handle.c

@@ -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 *

python/t/test830RHBZ1406906.py

@@ -0,0 +1,57 @@
+# libguestfs Python bindings
+# Copyright (C) 2017 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os
+import sys
+import shutil
+import tempfile
+import unittest
+
+import guestfs
+
+
+class Test830RHBZ1406906(unittest.TestCase):
+    def setUp(self):
+        self.tempdir = tempfile.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.tempdir)
+
+    def test_rhbz1406906(self):
+        g = guestfs.GuestFS(python_return_dict=True)
+
+        g.add_drive_scratch(512 * 1024 * 1024)
+        g.launch()
+
+        g.part_disk("/dev/sda", "mbr")
+        g.mkfs("ext4", "/dev/sda1")
+        g.mount("/dev/sda1", "/")
+
+        self.assertEqual(g.find("/"), ['lost+found'])
+
+        # touch file with illegal unicode character
+        non_utf8_fname = "\udcd4"
+        open(os.path.join(self.tempdir, non_utf8_fname), "w").close()
+
+        g.copy_in(self.tempdir, "/")
+
+        if sys.version_info >= (3, 0):
+            with self.assertRaises(UnicodeDecodeError):
+                g.find("/")  # segfault here on Python 3
+        elif sys.version_info >= (2, 0):
+            self.assertTrue(
+                any(path for path in g.find("/") if non_utf8_fname in path))