diff options
| author | Ben Kibbey <[email protected]> | 2016-07-19 00:16:46 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-07-19 09:14:23 +0000 |
| commit | 6a7ee33abd5059f5ae2f70a7dd9f610c16552f8e (patch) | |
| tree | a84a2653e3b4496c90f7fb31b388700d45ee2fbd | |
| parent | python: Make GPGME's version easily accessible. (diff) | |
| download | gpgme-6a7ee33abd5059f5ae2f70a7dd9f610c16552f8e.tar.gz gpgme-6a7ee33abd5059f5ae2f70a7dd9f610c16552f8e.zip | |
Fix including nil bytes in keylist output.
* src/gpgme-tool.c (cmd_keylist,gt_result): use strlen().
Signed-off-by: Ben Kibbey <[email protected]>
| -rw-r--r-- | src/gpgme-tool.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c index 080b3061..5ad5b256 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); |