[git] GPGME - branch, master, updated. gpgme-1.5.1-2-ge5ab116

by Werner Koch cvs at cvs.gnupg.org
Tue Aug 12 17:43:37 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  e5ab11607281b9838da2728268a8f9f0daa2b04d (commit)
      from  bfe18a0651177025ff0a6b978a641bdd1472a0b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e5ab11607281b9838da2728268a8f9f0daa2b04d
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 12 17:42:08 2014 +0200

    gpgme-tool: Fix segv for external key listing.
    
    * src/gpgme-tool.c (result_xml_escape): Allow for DATA being NULL.

diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c
index f02fffa..e1fd983 100644
--- a/src/gpgme-tool.c
+++ b/src/gpgme-tool.c
@@ -831,14 +831,17 @@ result_xml_escape (const char *data, char **buf)
   membuf_t mb;
 
   init_membuf (&mb, 128);
-  data_len = strlen (data);
-  for (i = 0; i < data_len; i++)
+  if (data)
     {
-      r = result_xml_escape_replacement (data[i]);
-      if (r)
-        put_membuf (&mb, r, strlen (r));
-      else
-        put_membuf (&mb, data+i, 1);
+      data_len = strlen (data);
+      for (i = 0; i < data_len; i++)
+        {
+          r = result_xml_escape_replacement (data[i]);
+          if (r)
+            put_membuf (&mb, r, strlen (r));
+          else
+            put_membuf (&mb, data+i, 1);
+        }
     }
   put_membuf (&mb, "", 1);
   *buf = get_membuf (&mb, NULL);

-----------------------------------------------------------------------

Summary of changes:
 src/gpgme-tool.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org




More information about the Gnupg-commits mailing list