pidgin/ljfisher-ssl-client-auth

merge of '4fbc64ec98a5db104dbff18b05f9a66edbbe724d'

2011-07-21, Paul Aurich
dbf62554913d
Parents 4fbc64ec98a5d9743aa9882a
Children c63531b35666
merge of '4fbc64ec98a5db104dbff18b05f9a66edbbe724d'
and 'd9743aa9882a7fc3076dd50291d55dd0ed1113c1'
2 files changed, 11 insertions(+), 0 deletions(-)
  • +6 -0
    libpurple/prefs.c
  • +5 -0
    libpurple/protocols/sametime/sametime.c
    • --- a/libpurple/prefs.c Thu Jul 21 05:36:54 2011 +0000
    +++ b/libpurple/prefs.c Thu Jul 21 05:37:06 2011 +0000
    @@ -277,6 +277,12 @@
    }
    }
    + if ((pref_type == PURPLE_PREF_BOOLEAN || pref_type == PURPLE_PREF_INT) &&
    + pref_value == NULL) {
    + /* Missing a value attribute */
    + return;
    + }
    +
    if(purple_strequal(element_name, "item")) {
    struct purple_pref *pref;
    --- a/libpurple/protocols/sametime/sametime.c Thu Jul 21 05:36:54 2011 +0000
    +++ b/libpurple/protocols/sametime/sametime.c Thu Jul 21 05:37:06 2011 +0000
    @@ -922,6 +922,11 @@
    alias = mwSametimeGroup_getAlias(stgroup);
    type = mwSametimeGroup_getType(stgroup);
    + if (!name) {
    + DEBUG_WARN("Can't ensure a null group\n");
    + return
    + }
    +
    DEBUG_INFO("attempting to ensure group %s, called %s\n",
    NSTR(name), NSTR(alias));