diff options
| author | Mark Doliner <markdoliner@pidgin.im> | 2007-06-11 07:45:19 +0000 |
|---|---|---|
| committer | Mark Doliner <markdoliner@pidgin.im> | 2007-06-11 07:45:19 +0000 |
| commit | 068eca664581c0f0da7ddbd124b22e21f9bbc9f2 (patch) | |
| tree | 877648b842229c7721413af4589fb650513ff4b0 | |
| parent | 90ce382cb6ef4afc0f26bdde7fbb0d8e73457b7b (diff) | |
| download | pidgin-068eca664581c0f0da7ddbd124b22e21f9bbc9f2.tar.gz | |
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)
| -rw-r--r-- | libpurple/util.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libpurple/util.c b/libpurple/util.c index 52603f2aef..828ae28840 100644 --- a/libpurple/util.c +++ b/libpurple/util.c @@ -1013,7 +1013,6 @@ purple_markup_find_tag(const char *needle, const char *haystack, g_return_val_if_fail( needle != NULL, FALSE); g_return_val_if_fail( *needle != '\0', FALSE); g_return_val_if_fail( haystack != NULL, FALSE); - g_return_val_if_fail( *haystack != '\0', FALSE); g_return_val_if_fail( start != NULL, FALSE); g_return_val_if_fail( end != NULL, FALSE); g_return_val_if_fail(attributes != NULL, FALSE); |