pidgin/pidgin

Make sure our GError variables are initialized to NULL

2021-11-02, Gary Kramlich
2b4446ccebc9
Parents e250a5b59c97
Children d12bedb8b662
Make sure our GError variables are initialized to NULL

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/1119/
6 files changed, 7 insertions(+), 9 deletions(-)
  • +1 -1
    libpurple/mediamanager.c
  • +1 -1
    libpurple/plugins/keyrings/internalkeyring.c
  • +1 -1
    libpurple/protocols/gg/gg.c
  • +1 -1
    libpurple/protocols/irc/parse.c
  • +1 -1
    pidgin/gtkconv.c
  • +2 -4
    pidgin/gtkmedia.c
    • --- a/libpurple/mediamanager.c Tue Nov 02 00:39:00 2021 -0500
    +++ b/libpurple/mediamanager.c Tue Nov 02 00:41:03 2021 -0500
    @@ -187,7 +187,7 @@
    static void
    purple_media_manager_init (PurpleMediaManager *media)
    {
    - GError *error;
    + GError *error = NULL;
    media->priv = purple_media_manager_get_instance_private(media);
    media->priv->medias = NULL;
    --- a/libpurple/plugins/keyrings/internalkeyring.c Tue Nov 02 00:39:00 2021 -0500
    +++ b/libpurple/plugins/keyrings/internalkeyring.c Tue Nov 02 00:41:03 2021 -0500
    @@ -647,7 +647,7 @@
    gpointer data)
    {
    const char *password;
    - GError *error;
    + GError *error = NULL;
    intkeyring_open();
    --- a/libpurple/protocols/gg/gg.c Tue Nov 02 00:39:00 2021 -0500
    +++ b/libpurple/protocols/gg/gg.c Tue Nov 02 00:41:03 2021 -0500
    @@ -769,7 +769,7 @@
    const char *address;
    const gchar *encryption_type, *protocol_version;
    GProxyResolver *resolver;
    - GError *error;
    + GError *error = NULL;
    purple_connection_set_flags(gc,
    PURPLE_CONNECTION_FLAG_HTML |
    --- a/libpurple/protocols/irc/parse.c Tue Nov 02 00:39:00 2021 -0500
    +++ b/libpurple/protocols/irc/parse.c Tue Nov 02 00:41:03 2021 -0500
    @@ -701,7 +701,7 @@
    g_free(msg);
    return;
    } else if (!strncmp(input, "ERROR ", 6)) {
    - GError *error;
    + GError *error = NULL;
    if (g_utf8_validate(input, -1, NULL)) {
    error = g_error_new(
    PURPLE_CONNECTION_ERROR,
    --- a/pidgin/gtkconv.c Tue Nov 02 00:39:00 2021 -0500
    +++ b/pidgin/gtkconv.c Tue Nov 02 00:41:03 2021 -0500
    @@ -1635,7 +1635,7 @@
    {
    GtkAccelGroup *accel_group;
    GtkActionGroup *action_group;
    - GError *error;
    + GError *error = NULL;
    GtkWidget *menuitem;
    action_group = gtk_action_group_new("ConversationActions");
    --- a/pidgin/gtkmedia.c Tue Nov 02 00:39:00 2021 -0500
    +++ b/pidgin/gtkmedia.c Tue Nov 02 00:41:03 2021 -0500
    @@ -283,15 +283,13 @@
    static GtkWidget *
    setup_menubar(PidginMedia *window)
    {
    - GError *error;
    + GError *error = NULL;
    GtkWidget *menu;
    window->priv->ui = gtk_builder_new();
    gtk_builder_set_translation_domain(window->priv->ui, PACKAGE);
    - error = NULL;
    - if (!gtk_builder_add_from_string(window->priv->ui, media_menu, -1,
    - &error))
    + if (!gtk_builder_add_from_string(window->priv->ui, media_menu, -1, &error))
    {
    g_message("building menus failed: %s", error->message);
    g_error_free(error);