Mercurial > pidgin
changeset 20846:49fcee9835aa
Fix CID 317 and 335 as well as an additional leak.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 09 Oct 2007 20:40:49 +0000 |
| parents | 296aaf148aed |
| children | be363a3c618f |
| files | libpurple/plugins/log_reader.c |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/log_reader.c Tue Oct 09 20:12:48 2007 +0000 +++ b/libpurple/plugins/log_reader.c Tue Oct 09 20:40:49 2007 +0000 @@ -1939,13 +1939,11 @@ g_return_val_if_fail(data->path != NULL, g_strdup("")); g_return_val_if_fail(data->length > 0, g_strdup("")); - error = NULL; - - contents = g_malloc(data->length + 2); - file = g_fopen(data->path, "rb"); g_return_val_if_fail(file != NULL, g_strdup("")); - + + contents = g_malloc(data->length + 2); + fseek(file, data->offset, SEEK_SET); fread(contents, data->length, 1, file); fclose(file); @@ -2026,7 +2024,7 @@ g_string_append(formatted, "</font> "); if (is_in_message) { - if (buddy_name != NULL && buddy->alias) { + if (buddy_name != NULL && buddy != NULL && buddy->alias) { g_string_append_printf(formatted, "<span style=\"color: #A82F2F;\">" "<b>%s</b></span>: ", buddy->alias); @@ -2056,7 +2054,9 @@ g_string_append(formatted, line); g_string_append(formatted, "<br>"); } - line = ++c; + + if (c) + line = ++c; } } g_free(contents);