Additional type checking in secrets API

2 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fb588381fe..82c24f11643 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-22  Daniel Colascione  <dancol@dancol.org>
+
+        * net/secrets.el (secrets-create-item,secrets-search-items): Check
+        that attribute values are strings, avoiding the construction of
+        invalid dbus messages.
+
 2014-02-21  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacs-lisp/gv.el: Avoid duplicating gv-expander and gv-setter in
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index a0f30e321d5..9ba9bd0d3cc 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -609,6 +609,8 @@ The object paths of the found items are returned as list."
       (while (consp (cdr attributes))
         (unless (keywordp (car attributes))
           (error 'wrong-type-argument (car attributes)))
+        (unless (stringp (cadr attributes))
+          (error 'wrong-type-argument (cadr attributes)))
         (setq props (add-to-list
                      'props
                      (list :dict-entry
@@ -647,6 +649,8 @@ The object path of the created item is returned."
         (while (consp (cdr attributes))
           (unless (keywordp (car attributes))
             (error 'wrong-type-argument (car attributes)))
+          (unless (stringp (cadr attributes))
+            (error 'wrong-type-argument (cadr attributes)))
           (setq props (add-to-list
                        'props
                        (list :dict-entry