[Gaim-commits] CVS: gaim/src xmlnode.c,1.9,1.9.2.1

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16935/src

Modified Files:
      Tag: oldstatus
	xmlnode.c 
Log Message:
some fixes from HEAD


Index: xmlnode.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/xmlnode.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -p -r1.9 -r1.9.2.1
--- xmlnode.c	23 Aug 2004 05:17:59 -0000	1.9
+++ xmlnode.c	31 Aug 2005 18:38:23 -0000	1.9.2.1
@@ -395,11 +395,15 @@ static GMarkupParser xmlnode_parser = {
 
 xmlnode *xmlnode_from_str(const char *str, size_t size)
 {
-	struct _xmlnode_parser_data *xpd = g_new0(struct _xmlnode_parser_data, 1);
+	struct _xmlnode_parser_data *xpd;
 	xmlnode *ret;
 	GMarkupParseContext *context;
-	size_t real_size = size == -1 ? strlen(str) : size;
+	size_t real_size;
 
+	g_return_val_if_fail(str != NULL, NULL);
+
+	real_size = size == -1 ? strlen(str) : size;
+	xpd = g_new0(struct _xmlnode_parser_data, 1);
 	context = g_markup_parse_context_new(&xmlnode_parser, 0, xpd, NULL);
 
 	if(!g_markup_parse_context_parse(context, str, real_size, NULL)) {