debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch: Correctly terminate text/* parts in JSON output

Browse source 
Text parts returned by `g_mime_stream_mem_get_byte_array()' are not
NULL terminated strings - add `json_quote_chararray()' to handle them
correctly.
This commit is contained in:
David Edmondson 2010-04-05 10:33:19 +01:00 committed by Carl Worth
parent bb52116846
commit 9eb3603299
3 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
json.c
View file

@ -47,29 +47,39 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
char *
json_quote_str(const void *ctx, const char *str)
json_quote_chararray(const void *ctx, const char *str, const size_t len)
{
const char *ptr;
char *ptr2;
char *out;
int len = 0;
size_t loop;
size_t required;
if (!str)
return NULL;
if (len == 0)
return (char *)"\"\"";
for (ptr = str; *ptr; len++, ptr++) {
for (loop = 0, required = 0, ptr = str;
loop < len;
loop++, required++, ptr++) {
if (*ptr < 32 || *ptr == '\"' || *ptr == '\\')
len++;
required++;
}
out = talloc_array (ctx, char, len + 3);
/*
* + 3 for:
* - leading quotation mark,
* - trailing quotation mark,
* - trailing NULL.
*/
out = talloc_array (ctx, char, required + 3);
ptr = str;
ptr2 = out;
*ptr2++ = '\"';
while (*ptr) {
for (loop = 0; loop < len; loop++) {
if (*ptr > 31 && *ptr != '\"' && *ptr != '\\') {
*ptr2++ = *ptr++;
} else {
@ -91,3 +101,9 @@ json_quote_str(const void *ctx, const char *str)
return out;
}
char *
json_quote_str(const void *ctx, const char *str)
{
return (json_quote_chararray (ctx, str, strlen (str)));
}

3
notmuch-client.h
View file

@ -132,6 +132,9 @@ show_message_body (const char *filename,
notmuch_status_t
show_one_part (const char *filename, int part);
char *
json_quote_chararray (const void *ctx, const char *str, const size_t len);
char *
json_quote_str (const void *ctx, const char *str);

2
notmuch-show.c
View file

@ -326,7 +326,7 @@ format_part_json (GMimeObject *part, int *part_count)
show_part_content (part, stream_memory);
part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));
printf (", \"content\": %s", json_quote_str (ctx, (char *) part_content->data));
printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len));
}
fputs ("}", stdout);