[Emacs-diffs] trunk r116521: Additional type checking in secrets API

[Daniel Colascione]

------------------------------------------------------------
revno: 116521
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-21 16:47:42 -0800
message:
  Additional type checking in secrets API
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/secrets.el            secrets.el-20100313201810-6s62gy70hbdnhfs1-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-21 19:01:19 +0000
+++ b/lisp/ChangeLog    2014-02-22 00:47:42 +0000
@@ -1,3 +1,9 @@
+2014-02-22  Daniel Colascione  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/gv.el: Avoid duplicating gv-expander and gv-setter in

=== modified file 'lisp/net/secrets.el'
--- a/lisp/net/secrets.el       2014-01-01 07:43:34 +0000
+++ b/lisp/net/secrets.el       2014-02-22 00:47:42 +0000
@@ -609,6 +609,8 @@
       (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 @@
        (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