diff options
| author | Paul Eggert | 2018-11-30 09:55:37 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-11-30 09:56:10 -0800 |
| commit | 7ecf49b5a5741cc4a895c8ff42bbb4577659192c (patch) | |
| tree | c670528e8dd8a28122e647ddaea4f53731d61299 /src/dbusbind.c | |
| parent | cc3ad9a3d1b278852336265e0505e82cc5453778 (diff) | |
| download | emacs-7ecf49b5a5741cc4a895c8ff42bbb4577659192c.tar.gz emacs-7ecf49b5a5741cc4a895c8ff42bbb4577659192c.zip | |
Fix core dump in dbus-message-internal
Backport from master.
* src/dbusbind.c (Fdbus_message_internal):
Don’t go past array end (Bug#33530).
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index ec3707d18f3..fe922d5429b 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -1419,7 +1419,7 @@ usage: (dbus-message-internal &rest REST) */) | |||
| 1419 | for (; count < nargs; ++count) | 1419 | for (; count < nargs; ++count) |
| 1420 | { | 1420 | { |
| 1421 | dtype = XD_OBJECT_TO_DBUS_TYPE (args[count]); | 1421 | dtype = XD_OBJECT_TO_DBUS_TYPE (args[count]); |
| 1422 | if (XD_DBUS_TYPE_P (args[count])) | 1422 | if (count + 1 < nargs && XD_DBUS_TYPE_P (args[count])) |
| 1423 | { | 1423 | { |
| 1424 | XD_DEBUG_VALID_LISP_OBJECT_P (args[count]); | 1424 | XD_DEBUG_VALID_LISP_OBJECT_P (args[count]); |
| 1425 | XD_DEBUG_VALID_LISP_OBJECT_P (args[count+1]); | 1425 | XD_DEBUG_VALID_LISP_OBJECT_P (args[count+1]); |