[git] GPGME - branch, master, updated. gpgme-1.6.0-240-g6a7ee33

[by Ben Kibbey]

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  6a7ee33abd5059f5ae2f70a7dd9f610c16552f8e (commit)
      from  e545ca3f682b615ce447c186a2c73489a32b0592 (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 6a7ee33abd5059f5ae2f70a7dd9f610c16552f8e
Author: Ben Kibbey <bjk at luxsci.net>
Date:   Mon Jul 18 20:16:46 2016 -0400

    Fix including nil bytes in keylist output.
    
    * src/gpgme-tool.c (cmd_keylist,gt_result): use strlen().
    
    Signed-off-by: Ben Kibbey <bjk at luxsci.net>

diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c
index 080b306..5ad5b25 100644
--- a/src/gpgme-tool.c
+++ b/src/gpgme-tool.c
@@ -1725,9 +1725,9 @@ gt_result (gpgme_tool_t gt, unsigned int flags)
 {
   int indent = 2;
 
-  gt_write_data (gt, xml_preamble1, sizeof (xml_preamble1));
+  gt_write_data (gt, xml_preamble1, strlen (xml_preamble1));
   gt_write_data (gt, NULL, 0);
-  gt_write_data (gt, xml_preamble2, sizeof (xml_preamble2));
+  gt_write_data (gt, xml_preamble2, strlen (xml_preamble2));
   gt_write_data (gt, NULL, 0);
   if (flags & GT_RESULT_ENCRYPT)
     result_encrypt_to_xml (gt->ctx, indent,
@@ -1753,7 +1753,7 @@ gt_result (gpgme_tool_t gt, unsigned int flags)
   if (flags & GT_RESULT_VFS_MOUNT)
     result_vfs_mount_to_xml (gt->ctx, indent,
 			     (result_xml_write_cb_t) gt_write_data, gt);
-  gt_write_data (gt, xml_end, sizeof (xml_end));
+  gt_write_data (gt, xml_end, strlen (xml_end));
 
   return 0;
 }
@@ -2853,9 +2853,9 @@ cmd_keylist (assuan_context_t ctx, char *line)
     }
   pattern[idx] = NULL;
 
-  gt_write_data (gt, xml_preamble1, sizeof (xml_preamble1));
+  gt_write_data (gt, xml_preamble1, strlen (xml_preamble1));
   gt_write_data (gt, NULL, 0);
-  gt_write_data (gt, xml_preamble2, sizeof (xml_preamble2));
+  gt_write_data (gt, xml_preamble2, strlen (xml_preamble2));
   gt_write_data (gt, NULL, 0);
   result_init (&state, indent, (result_xml_write_cb_t) gt_write_data, gt);
   result_xml_tag_start (&state, "keylist", NULL);
@@ -2930,7 +2930,7 @@ cmd_keylist (assuan_context_t ctx, char *line)
     }
 
   result_xml_tag_end (&state);  /* keylist */
-  gt_write_data (gt, xml_end, sizeof (xml_end));
+  gt_write_data (gt, xml_end, strlen (xml_end));
 
   server_reset_fds (server);
 

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

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


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