_message_iter_get_pyobject: if UTF-8 from libdbus is invalid, don't crash

Based on part of a patch from Barry Warsaw.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

1 files changed, 7 insertions, 3 deletions

diff --git a/_dbus_bindings/message-get-args.c b/_dbus_bindings/message-get-args.c
index 5f3d89c..032d530 100644
--- a/_dbus_bindings/message-get-args.c
+++ b/_dbus_bindings/message-get-args.c
@@ -245,9 +245,13 @@ _message_iter_get_pyobject(DBusMessageIter *iter,
                                     args, kwargs);
             }
             else {
-                args = Py_BuildValue("(N)", PyUnicode_DecodeUTF8(u.s,
-                                                                 strlen(u.s),
-                                                                 NULL));
+                PyObject *unicode;
+
+                unicode = PyUnicode_DecodeUTF8(u.s, strlen(u.s), NULL);
+                if (!unicode) {
+                    break;
+                }
+                args = Py_BuildValue("(N)", unicode);
                 if (!args) {
                     break;
                 }