rewtguy/pidgin

Fix some issues scanbuild found in the Novell protocol plugin
release-2.x.y
2021-06-02, Gary Kramlich
40d6cd6dc56d
Parents ad5beb40c3fe
Children 40211e37a935
Fix some issues scanbuild found in the Novell protocol plugin

Testing Done:
Verified scanbuild no longer detected the errors.

Reviewed at https://reviews.imfreedom.org/r/710/
3 files changed, 6 insertions(+), 9 deletions(-)
  • +2 -6
    libpurple/protocols/novell/nmevent.c
  • +0 -3
    libpurple/protocols/novell/nmfield.c
  • +4 -0
    libpurple/protocols/novell/novell.c
    • --- a/libpurple/protocols/novell/nmevent.c Tue Jun 01 22:23:58 2021 -0500
    +++ b/libpurple/protocols/novell/nmevent.c Wed Jun 02 02:59:18 2021 -0500
    @@ -927,15 +927,11 @@
    } else if (rc == NM_OK && (cb = nm_user_get_event_callback(user))) {
    cb(user, event);
    -
    - if (event)
    - nm_release_event(event);
    - } else {
    - if (event)
    - nm_release_event(event);
    }
    /* Cleanup */
    + if (event)
    + nm_release_event(event);
    if (source)
    g_free(source);
    --- a/libpurple/protocols/novell/nmfield.c Tue Jun 01 22:23:58 2021 -0500
    +++ b/libpurple/protocols/novell/nmfield.c Wed Jun 02 02:59:18 2021 -0500
    @@ -339,9 +339,6 @@
    value = g_strdup(NM_FIELD_FALSE);
    }
    } else {
    - /* assume it is a number */
    - value = g_new0(char, 20);
    -
    switch (field->type) {
    case NMFIELD_TYPE_BYTE:
    case NMFIELD_TYPE_WORD:
    --- a/libpurple/protocols/novell/novell.c Tue Jun 01 22:23:58 2021 -0500
    +++ b/libpurple/protocols/novell/novell.c Wed Jun 02 02:59:18 2021 -0500
    @@ -3306,6 +3306,8 @@
    rc = nm_send_create_privacy_item(user, dn, TRUE,
    _create_privacy_item_deny_resp_cb,
    g_strdup(dn));
    + if (_check_for_disconnect(user, rc))
    + return;
    }
    } else {
    purple_privacy_permit_remove(gc->account, (char *)node->data, TRUE);
    @@ -3349,6 +3351,8 @@
    rc = nm_send_create_privacy_item(user, dn, FALSE,
    _create_privacy_item_deny_resp_cb,
    g_strdup(name));
    + if (_check_for_disconnect(user, rc))
    + return;
    }
    } else {
    purple_privacy_deny_remove(gc->account, (char *)node->data, TRUE);