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

lib/message-file.c: use g_malloc () & g_free () in hash table values

Browse source 
The message->headers hash table values get data returned by
g_mime_utils_header_decode_text ().

The pointer returned by g_mime_utils_header_decode_text is from the
following line in rfc2047_decode_tokens

        return g_string_free (decoded, FALSE);

The docs for g_string_free say

 Frees the memory allocated for the GString. If free_segment is TRUE
 it also frees the character data. If it's FALSE, the caller gains
 ownership of the buffer and must free it after use with g_free().

The remaining frees and allocations referencing to message->headers hash
values have been changed to use g_free and g_malloc functions.

This combines and completes the changes started by David Bremner.
This commit is contained in:
Tomi Ollila 2012-12-21 19:52:01 +02:00 committed by David Bremner
parent 02a0f341dc
commit 27dacc7947
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/message-file.c
View file

@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char *filename)
message->headers = g_hash_table_new_full (strcase_hash, message->headers = g_hash_table_new_full (strcase_hash,
strcase_equal, strcase_equal,
free, free,
free); g_free);
message->parsing_started = 0; message->parsing_started = 0;
message->parsing_finished = 0; message->parsing_finished = 0;
@ -337,11 +337,11 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
/* we need to add the header to those we already collected */ /* we need to add the header to those we already collected */
newhdr = strlen(decoded_value); newhdr = strlen(decoded_value);
hdrsofar = strlen(header_sofar); hdrsofar = strlen(header_sofar);
combined_header = xmalloc(hdrsofar + newhdr + 2); combined_header = g_malloc(hdrsofar + newhdr + 2);
strncpy(combined_header,header_sofar,hdrsofar); strncpy(combined_header,header_sofar,hdrsofar);
*(combined_header+hdrsofar) = ' '; *(combined_header+hdrsofar) = ' ';
strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1); strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);
free (decoded_value); g_free (decoded_value);
g_hash_table_insert (message->headers, header, combined_header); g_hash_table_insert (message->headers, header, combined_header);
} }
} else { } else {
@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
g_hash_table_insert (message->headers, header, decoded_value); g_hash_table_insert (message->headers, header, decoded_value);
} else { } else {
free (header); free (header);
free (decoded_value); g_free (decoded_value);
decoded_value = header_sofar; decoded_value = header_sofar;
} }
} }