# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1311226626 0
# Node ID d6c47cc28870f9502a4ac71d5afc35569984e096
# Parent  d1ea32c416347afea67f6707f2f0b7082e46650d# Parent  3ef5e744589c8542c000ab23b8784e81424084b0
merge of '60a632cb295df557713697e92727d551d7345451'
     and 'f0591ed5820261562bb9d8f49c75d08e3b334bfa'

diff -r d1ea32c41634 -r d6c47cc28870 libpurple/prefs.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;
 
diff -r d1ea32c41634 -r d6c47cc28870 libpurple/protocols/sametime/sametime.c
--- 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));