epg: Adjust to GnuPG 2.1 key listing change

* epg.el (epg--list-keys-1): Ignore fields after the 15th field
(bug#18979).  Reported by Hideki Saito.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e447d446db521e05966a8b6a43bc2d6b1e6049f..d2eda8962955c81587fb1a4c89fc22e22b03fb6a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-07  Daiki Ueno  <ueno@gnu.org>
+
+       * epg.el (epg--list-keys-1): Ignore fields after the 15th field
+       (bug#18979).  Reported by Hideki Saito.
+
 2014-11-06  Daiki Ueno  <ueno@gnu.org>
 
        * emacs-lisp/package.el (package--display-verify-error): New function.

diff --git a/lisp/epg.el b/lisp/epg.el
index 0c74531d7b8ef910298dcc23ec17a4978261b455..e4d8c1e1a024d134733c86d8c3ca252de4fca21a 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1278,8 +1278,9 @@ callback data (if any)."
              string (match-string 0)
              index 0
              field 0)
-       (while (eq index
-                  (string-match "\\([^:]+\\)?:" string index))
+       (while (and (< field (length (car keys)))
+                   (eq index
+                       (string-match "\\([^:]+\\)?:" string index)))
          (setq index (match-end 0))
          (aset (car keys) field (match-string 1 string))
          (setq field (1+ field))))