# HG changeset patch # User Mark Doliner # Date 1047875239 0 # Node ID 3f44efdfb4cf0ccb2c2b2142036444eb7a81b3b1 # Parent 315ef59a50318ad7ad15c3a8235ecd834ea7581e [gaim-migrate @ 5127] Well that was fun committer: Tailor Script diff -r 315ef59a5031 -r 3f44efdfb4cf src/protocols/oscar/info.c --- a/src/protocols/oscar/info.c Mon Mar 17 04:19:24 2003 +0000 +++ b/src/protocols/oscar/info.c Mon Mar 17 04:27:19 2003 +0000 @@ -624,7 +624,7 @@ * about the buddy icon that the user has stored on * the server. */ - char *iconstr; +/* char *iconstr; outinfo->iconstrlen = length-4; outinfo->iconstrlen -= aim_bstream_advance(bs, aimbs_get16(bs)); outinfo->iconstrlen -= aim_bstream_advance(bs, aimbs_get16(bs)); @@ -633,7 +633,8 @@ memcpy(outinfo->iconstr, iconstr, outinfo->iconstrlen); } else outinfo->iconstrlen = 0; - free(iconstr); + free(iconstr); */ + outinfo->iconstrlen = 0; } else if (type == 0x001e) { /* diff -r 315ef59a5031 -r 3f44efdfb4cf src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Mon Mar 17 04:19:24 2003 +0000 +++ b/src/protocols/oscar/oscar.c Mon Mar 17 04:27:19 2003 +0000 @@ -1755,9 +1755,9 @@ if (od->icontimer) g_source_remove(od->icontimer); od->icontimer = g_timeout_add(500, gaim_icon_timerfunc, gc); + memcpy(bi->iconstr, info->iconstr, info->iconstrlen); } bi->iconstrlen = info->iconstrlen; - memcpy(bi->iconstr, info->iconstr, info->iconstrlen); serv_got_update(gc, info->sn, 1, info->warnlevel/10, signon, time_idle, type);