pidgin/android/libpurple

Fix various other minor issues identified in the coverity scan.
release-2.x.y
2013-02-19, Daniel Atallah
6625cbf09e08
Parents 96f89e35d24d
Children 5e1a2b90561c
Fix various other minor issues identified in the coverity scan.
5 files changed, 8 insertions(+), 10 deletions(-)
  • +2 -4
    libpurple/protocols/jabber/bosh.c
  • +1 -1
    libpurple/protocols/oscar/family_icbm.c
  • +1 -0
    libpurple/theme-loader.c
  • +0 -2
    libpurple/upnp.c
  • +4 -3
    pidgin/gtkimhtml.c
    • --- a/libpurple/protocols/jabber/bosh.c Mon Feb 18 23:44:29 2013 -0500
    +++ b/libpurple/protocols/jabber/bosh.c Tue Feb 19 00:32:22 2013 -0500
    @@ -348,10 +348,8 @@
    * sent immediately), queue up the data and start a timer to flush
    * the buffer.
    */
    - if (data) {
    - int len = data ? strlen(data) : 0;
    - purple_circ_buffer_append(conn->pending, data, len);
    - }
    + if (data)
    + purple_circ_buffer_append(conn->pending, data, strlen(data));
    if (purple_debug_is_verbose())
    purple_debug_misc("jabber", "bosh: %p has %" G_GSIZE_FORMAT " bytes in "
    --- a/libpurple/protocols/oscar/family_icbm.c Mon Feb 18 23:44:29 2013 -0500
    +++ b/libpurple/protocols/oscar/family_icbm.c Tue Feb 19 00:32:22 2013 -0500
    @@ -156,7 +156,7 @@
    purple_debug_error("oscar",
    "Message error with bn %s and reason %hu and errcode %hu\n",
    - (bn != NULL ? bn : ""), reason, errcode);
    + bn, reason, errcode);
    #ifdef TODOFT
    /* If this was a file transfer request, bn is a cookie */
    --- a/libpurple/theme-loader.c Mon Feb 18 23:44:29 2013 -0500
    +++ b/libpurple/theme-loader.c Tue Feb 19 00:32:22 2013 -0500
    @@ -63,6 +63,7 @@
    switch (param_id) {
    case PROP_TYPE:
    g_value_set_string(value, purple_theme_loader_get_type_string(theme_loader));
    + break;
    default:
    G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, psec);
    break;
    --- a/libpurple/upnp.c Mon Feb 18 23:44:29 2013 -0500
    +++ b/libpurple/upnp.c Tue Feb 19 00:32:22 2013 -0500
    @@ -746,7 +746,6 @@
    purple_upnp_get_public_ip()
    {
    if (control_info.status == PURPLE_UPNP_STATUS_DISCOVERED
    - && control_info.publicip
    && strlen(control_info.publicip) > 0)
    return control_info.publicip;
    @@ -805,7 +804,6 @@
    purple_upnp_get_internal_ip(void)
    {
    if (control_info.status == PURPLE_UPNP_STATUS_DISCOVERED
    - && control_info.internalip
    && strlen(control_info.internalip) > 0)
    return control_info.internalip;
    --- a/pidgin/gtkimhtml.c Mon Feb 18 23:44:29 2013 -0500
    +++ b/pidgin/gtkimhtml.c Tue Feb 19 00:32:22 2013 -0500
    @@ -2353,10 +2353,11 @@
    if (!g_ascii_strncasecmp(string, "!--", strlen ("!--"))) {
    gchar *e = strstr (string + strlen("!--"), "-->");
    if (e) {
    - if (len)
    + if (len) {
    *len = e - string + strlen ("-->");
    - if (tag)
    - *tag = g_strndup (string + strlen ("!--"), *len - strlen ("!---->"));
    + if (tag)
    + *tag = g_strndup (string + strlen ("!--"), *len - strlen ("!---->"));
    + }
    return TRUE;
    }
    }