summaryrefslogtreecommitdiff
path: root/lisp/epg.el
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2014-11-07 11:31:12 +0900
committerDaiki Ueno <ueno@gnu.org>2014-11-07 11:31:12 +0900
commit135a9f4b5aead507c030fb7e3e8ad13aaa91f403 (patch)
tree57ebb5414d9344bec3150dc58a47378ebbf9d775 /lisp/epg.el
parent55ea575e131ff6295e64abaa7e766073e3a9b4d1 (diff)
downloademacs-135a9f4b5aead507c030fb7e3e8ad13aaa91f403.tar.gz
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.
Diffstat (limited to 'lisp/epg.el')
-rw-r--r--lisp/epg.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/epg.el b/lisp/epg.el
index 0c74531d7b8..e4d8c1e1a02 100644
--- 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))))