pidgin/pidgin

Fix coverity log_reader issues
release-2.x.y
2014-05-12, Tomasz Wasilczyk
ee9d95cb8ee6
Parents 2897add11757
Children 175e769076e1
Fix coverity log_reader issues
1 files changed, 18 insertions(+), 9 deletions(-)
  • +18 -9
    libpurple/plugins/log_reader.c
    • --- a/libpurple/plugins/log_reader.c Mon May 12 21:13:35 2014 +0200
    +++ b/libpurple/plugins/log_reader.c Mon May 12 21:22:30 2014 +0200
    @@ -1422,12 +1422,16 @@
    purple_debug_info("Trillian log read", "Reading %s\n", data->path);
    - read = g_malloc(data->length + 2);
    -
    file = g_fopen(data->path, "rb");
    g_return_val_if_fail(file != NULL, g_strdup(""));
    - if (fseek(file, data->offset, SEEK_SET) != 0)
    +
    + read = g_malloc(data->length + 2);
    +
    + if (fseek(file, data->offset, SEEK_SET) != 0) {
    + fclose(file);
    + g_free(read);
    g_return_val_if_reached(g_strdup(""));
    + }
    data->length = fread(read, 1, data->length, file);
    fclose(file);
    @@ -1849,8 +1853,7 @@
    } else {
    while (*c)
    c++;
    - if (c)
    - c--;
    + c--;
    c = g_strrstr(c, "(");
    }
    @@ -1953,8 +1956,11 @@
    contents = g_malloc(data->length + 2);
    - if (fseek(file, data->offset, SEEK_SET) != 0)
    + if (fseek(file, data->offset, SEEK_SET) != 0) {
    + fclose(file);
    + g_free(contents);
    g_return_val_if_reached(g_strdup(""));
    + }
    data->length = fread(contents, 1, data->length, file);
    fclose(file);
    @@ -2335,13 +2341,16 @@
    g_return_val_if_fail(data->path != NULL, g_strdup(""));
    g_return_val_if_fail(data->length > 0, g_strdup(""));
    - contents = g_malloc(data->length + 2);
    -
    file = g_fopen(data->path, "rb");
    g_return_val_if_fail(file != NULL, g_strdup(""));
    - if (fseek(file, data->offset, SEEK_SET) != 0)
    + contents = g_malloc(data->length + 2);
    +
    + if (fseek(file, data->offset, SEEK_SET) != 0) {
    + fclose(file);
    + free(contents);
    g_return_val_if_reached(g_strdup(""));
    + }
    data->length = fread(contents, 1, data->length, file);
    fclose(file);