diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-10-05 13:58:28 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-10-05 13:58:28 +0200 |
| commit | 0a5a1adab986de39a147771b8f9aa21656ecc001 (patch) | |
| tree | 686a26d506f082b7b337fd50c86d45fa1992d0bc /src/dbusbind.c | |
| parent | c47479cf171cac3d2b867fc4663398c3c3531524 (diff) | |
| download | emacs-0a5a1adab986de39a147771b8f9aa21656ecc001.tar.gz | |
* src/dbusbind.c (xd_signature): Better type check for array elements.
* test/lisp/net/dbus-tests.el (dbus-test01-compound-types): Extend test.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 1ac77313a35..7904606d39e 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -446,12 +446,18 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object) { Lisp_Object elt1 = XD_NEXT_VALUE (elt); if (CONSP (elt1) && STRINGP (XCAR (elt1)) && NILP (XCDR (elt1))) - subsig = SSDATA (XCAR (elt1)); + { + subsig = SSDATA (XCAR (elt1)); + elt = Qnil; + } } while (!NILP (elt)) { - if (subtype != XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt))) + char x[DBUS_MAXIMUM_SIGNATURE_LENGTH]; + subtype = XD_OBJECT_TO_DBUS_TYPE (CAR_SAFE (elt)); + xd_signature (x, subtype, dtype, CAR_SAFE (XD_NEXT_VALUE (elt))); + if (strcmp (subsig, x) != 0) wrong_type_argument (intern ("D-Bus"), CAR_SAFE (elt)); elt = CDR_SAFE (XD_NEXT_VALUE (elt)); } |