GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix including nil bytes in keylist output.

Browse Source 
* src/gpgme-tool.c (cmd_keylist,gt_result): use strlen().

Signed-off-by: Ben Kibbey <bjk@luxsci.net>
This commit is contained in:
Ben Kibbey 2016-07-18 20:16:46 -04:00 committed by Justus Winter
parent e545ca3f68
commit 6a7ee33abd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gpgme-tool.c
View File

@ -1725,9 +1725,9 @@ gt_result (gpgme_tool_t gt, unsigned int flags)
{ {
int indent = 2; 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, 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); gt_write_data (gt, NULL, 0);
if (flags & GT_RESULT_ENCRYPT) if (flags & GT_RESULT_ENCRYPT)
result_encrypt_to_xml (gt->ctx, indent, 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) if (flags & GT_RESULT_VFS_MOUNT)
result_vfs_mount_to_xml (gt->ctx, indent, result_vfs_mount_to_xml (gt->ctx, indent,
(result_xml_write_cb_t) gt_write_data, gt); (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; return 0;
} }
@ -2853,9 +2853,9 @@ cmd_keylist (assuan_context_t ctx, char *line)
} }
pattern[idx] = NULL; 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, 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); gt_write_data (gt, NULL, 0);
result_init (&state, indent, (result_xml_write_cb_t) gt_write_data, gt); result_init (&state, indent, (result_xml_write_cb_t) gt_write_data, gt);
result_xml_tag_start (&state, "keylist", NULL); 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 */ 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); server_reset_fds (server);