pidgin/pidgin

Fix some GError leaks.

2020-11-20, Elliott Sales de Andrade
4726bf0ff977
Parents 3e8d3f5d6b01
Children e139fc54c76c
Fix some GError leaks.

Testing Done:
Compile only

Reviewed at https://reviews.imfreedom.org/r/244/
4 files changed, 13 insertions(+), 8 deletions(-)
  • +1 -1
    libpurple/protocols/facebook/facebook.c
  • +1 -1
    libpurple/protocols/gg/gg.c
  • +8 -5
    libpurple/protocols/irc/parse.c
  • +3 -1
    libpurple/protocols/jabber/jabber.c
    • --- a/libpurple/protocols/facebook/facebook.c Fri Nov 20 02:10:50 2020 -0600
    +++ b/libpurple/protocols/facebook/facebook.c Fri Nov 20 16:19:48 2020 -0600
    @@ -975,7 +975,7 @@
    if (resolver == NULL) {
    fb_util_debug_error("Unable to get account proxy resolver: %s",
    error->message);
    - purple_connection_g_error(gc, error);
    + purple_connection_take_error(gc, error);
    return;
    }
    --- a/libpurple/protocols/gg/gg.c Fri Nov 20 02:10:50 2020 -0600
    +++ b/libpurple/protocols/gg/gg.c Fri Nov 20 16:19:48 2020 -0600
    @@ -710,7 +710,7 @@
    if (resolver == NULL) {
    purple_debug_error("gg", "Unable to get account proxy resolver: %s",
    error->message);
    - purple_connection_g_error(gc, error);
    + purple_connection_take_error(gc, error);
    return;
    }
    --- a/libpurple/protocols/irc/parse.c Fri Nov 20 02:10:50 2020 -0600
    +++ b/libpurple/protocols/irc/parse.c Fri Nov 20 16:19:48 2020 -0600
    @@ -700,16 +700,19 @@
    g_free(msg);
    return;
    } else if (!strncmp(input, "ERROR ", 6)) {
    + GError *error;
    if (g_utf8_validate(input, -1, NULL)) {
    - purple_connection_take_error(gc, g_error_new(
    + error = g_error_new(
    PURPLE_CONNECTION_ERROR,
    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
    - "%s\n%s", _("Disconnected."), input));
    - } else
    - purple_connection_take_error(gc, g_error_new_literal(
    + "%s\n%s", _("Disconnected."), input);
    + } else {
    + error = g_error_new_literal(
    PURPLE_CONNECTION_ERROR,
    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
    - _("Disconnected.")));
    + _("Disconnected."));
    + }
    + purple_connection_take_error(gc, error);
    return;
    #ifdef HAVE_CYRUS_SASL
    } else if (!strncmp(input, "AUTHENTICATE ", 13)) {
    --- a/libpurple/protocols/jabber/jabber.c Fri Nov 20 02:10:50 2020 -0600
    +++ b/libpurple/protocols/jabber/jabber.c Fri Nov 20 16:19:48 2020 -0600
    @@ -383,6 +383,8 @@
    if (error->code != G_IO_ERROR_CANCELLED) {
    g_prefix_error(&error, "%s", _("Lost connection with server: "));
    purple_connection_take_error(js->gc, error);
    + } else {
    + g_error_free(error);
    }
    }
    }
    @@ -612,7 +614,7 @@
    } else {
    g_prefix_error(&error, "%s",
    _("Lost connection with server: "));
    - purple_connection_g_error(js->gc, error);
    + purple_connection_take_error(js->gc, error);
    }
    return G_SOURCE_REMOVE;
    }