Revision 4d7d41d5e4453c6c4d9faed59eac1a99fa012b9c

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 4d7d41d5e4453c6c4d9faed59eac1a99fa012b9c
Ancestor: cba0e5513039df347fefb078354a4a51a5812f1a
Author: markdoliner at pidgin.im
Date: 2007-06-11T07:45:19
Branch: im.pidgin.pidgin.2.1.0

Modified files:
        libpurple/util.c

ChangeLog: 

I think it's reasonable to search through a haystack that is the
empty string.  This gets rid of the following assertion failure
for me:

#0  0x00002b7f5ebdccab in raise () from /lib/libc.so.6
#1  0x00002b7f5ebde660 in abort () from /lib/libc.so.6
#2  0x00002b7f5e046b1b in g_logv () from /usr/lib/libglib-2.0.so.0
#3  0x00002b7f5e046bb3 in g_log () from /usr/lib/libglib-2.0.so.0
#4  0x00002b7f5e326746 in purple_markup_find_tag (needle=0x2b7f5e33fb89 "img", 
    haystack=0x11fcf6c "", start=0x7fff51043070, end=0x7fff51043068, 
    attributes=0x7fff51043060) at util.c:1016
#5  0x00002b7f5e2fa9f4 in convert_image_tags (log=0x931a80, 
    msg=0x11fcf60 "<IMG ID=\"1\">") at log.c:709
#6  0x00002b7f5e2fba15 in html_logger_write (log=0x931a80, type=4097, 
    from=0x778e00 "lk80z", time=1181547027, message=0x11fcf60 "<IMG ID=\"1\">")
    at log.c:1339
#7  0x00002b7f5e2f8fee in purple_log_write (log=0x931a80, type=4097, 
    from=0x778e00 "lk80z", time=1181547027, message=0x11fcf60 "<IMG ID=\"1\">")
    at log.c:155
#8  0x00002b7f5e2eca6c in purple_conversation_write (conv=0x1041500, 
    who=0xf50ba0 "giantpucepanda", message=0x11ec670 "<IMG ID=\"1\">", 
    flags=4097, mtime=1181547027) at conversation.c:883
#9  0x0000000000452ca5 in pidgin_conv_write_im (conv=0x1041500, who=0x0, 
    message=0x11ec670 "<IMG ID=\"1\">", flags=4097, mtime=1181547027)
    at gtkconv.c:4827
#10 0x00002b7f5e2ed21e in purple_conv_im_write (im=0x111b170, who=0x0, 
    message=0x11ec670 "<IMG ID=\"1\">", flags=4097, mtime=1181547027)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 4d7d41d5e4453c6c4d9faed59eac1a99fa012b9c.diff
Type: text/x-diff
Size: 605 bytes
Desc: not available
Url : http://pidgin.im/pipermail/commits/attachments/20070611/0f9cf64a/attachment-0001.diff