merge of '2c3aa45bcd7c2b8419935f90818498266191e9bc'

Tue, 24 Apr 2007 03:37:14 +0000

author
William Ehlhardt <williamehlhardt@gmail.com>
date
Tue, 24 Apr 2007 03:37:14 +0000
changeset 16434
13d46519ebd8
parent 16433
2c3aa45bcd7c (diff)
parent 16432
abc01f68aaee (current diff)
child 16435
5b8caa5c6249

merge of '2c3aa45bcd7c2b8419935f90818498266191e9bc'
and 'abc01f68aaee963e0003c6586921abdc03ab2edd'


committer: Evan Schoenberg <evands@pidgin.im>

--- a/libpurple/plugins/tcl/tcl_ref.c	Tue Apr 24 02:51:54 2007 +0000
+++ b/libpurple/plugins/tcl/tcl_ref.c	Tue Apr 24 03:37:14 2007 +0000
@@ -114,16 +114,17 @@
 	char *ptr;
 	PurpleStringref *type;
 	void *value;
+	int magicnumber = strlen("purple-");
 
-	if (strlen(bytes) < 7
-	    || strncmp(bytes, "purple-", 7)
+	if (strlen(bytes) < magicnumber
+	    || strncmp(bytes, "purple-", magicnumber)
 	    || (ptr = strchr(bytes, ':')) == NULL
-	    || (ptr - bytes) == 7)
+	    || (ptr - bytes) == magicnumber)
 		goto badobject;
 
 	/* Bad Ethan */
 	*ptr = '\0';
-	type = purple_stringref_new(bytes + 7);
+	type = purple_stringref_new(bytes + magicnumber);
 	*ptr = ':';
 	ptr++;
 

mercurial