]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix core dump in dbus-message-internal
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Nov 2018 05:36:18 +0000 (21:36 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Nov 2018 05:36:43 +0000 (21:36 -0800)
* src/dbusbind.c (Fdbus_message_internal):
Don’t go past array end (Bug#33530).

src/dbusbind.c

index 9bc344e9612f34adf5a59a175b9cfcb59305900e..403fc598c09516a79d29b548d7d9daf6098039ab 100644 (file)
@@ -1423,7 +1423,7 @@ usage: (dbus-message-internal &rest REST)  */)
   for (; count < nargs; ++count)
     {
       dtype = XD_OBJECT_TO_DBUS_TYPE (args[count]);
-      if (XD_DBUS_TYPE_P (args[count]))
+      if (count + 1 < nargs && XD_DBUS_TYPE_P (args[count]))
        {
          XD_DEBUG_VALID_LISP_OBJECT_P (args[count]);
          XD_DEBUG_VALID_LISP_OBJECT_P (args[count+1]);