[Emacs-diffs] emacs-26 7ecf49b: Fix core dump in dbus-message-internal

[Paul Eggert]

branch: emacs-26
commit 7ecf49b5a5741cc4a895c8ff42bbb4577659192c
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Fix core dump in dbus-message-internal
    
    Backport from master.
    * src/dbusbind.c (Fdbus_message_internal):
    Don’t go past array end (Bug#33530).
---
 src/dbusbind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dbusbind.c b/src/dbusbind.c
index ec3707d..fe922d5 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -1419,7 +1419,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]);