Mercurial > pidgin.yaz
changeset 16339:2a575756340a
merge of 'ed8e54275ef886f687084411cbb9280b8a2e3111'
and 'fada40b291356ece697cf6bf0fff3e833ea736ad'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Tue, 24 Apr 2007 03:32:09 +0000 |
parents | 2cf8383a806f (diff) 1f50acd0e7e1 (current diff) |
children | bf353c85959a |
files | |
diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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:32:09 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++;