changeset 32212:d6c47cc28870

merge of '60a632cb295df557713697e92727d551d7345451' and 'f0591ed5820261562bb9d8f49c75d08e3b334bfa'
author Paul Aurich <paul@darkrain42.org>
date Thu, 21 Jul 2011 05:37:06 +0000
parents d1ea32c41634 (current diff) 3ef5e744589c (diff)
children 6d6056e176fe
files
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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));