Mercurial > pidgin
comparison src/protocols/oscar/ft.c @ 9070:f13172eed3ad
[gaim-migrate @ 9846]
This fixes what is hopefully the last common direct connect segfault.
Basicly, we were memcpying cookies, and one was null. This was because
our get the cookie function was returning null, because it checked if the
conn was a direct im conn and it wasn't. It was a listening conn instead.
So this adds NULL checks, and makes the get cookie function do less sanity
checking, since it was failing some valid cases.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Wed, 26 May 2004 04:55:10 +0000 |
parents | 460d02fe03df |
children | 30a812571a6b |
comparison
equal
deleted
inserted
replaced
9069:0c69f5182652 | 9070:f13172eed3ad |
---|---|
419 faim_export const char *aim_odc_getcookie(aim_conn_t *conn) | 419 faim_export const char *aim_odc_getcookie(aim_conn_t *conn) |
420 { | 420 { |
421 struct aim_odc_intdata *intdata; | 421 struct aim_odc_intdata *intdata; |
422 | 422 |
423 if (!conn || !conn->internal) | 423 if (!conn || !conn->internal) |
424 return NULL; | |
425 | |
426 if ((conn->type != AIM_CONN_TYPE_RENDEZVOUS) || | |
427 (conn->subtype != AIM_CONN_SUBTYPE_OFT_DIRECTIM)) | |
428 return NULL; | 424 return NULL; |
429 | 425 |
430 intdata = (struct aim_odc_intdata *)conn->internal; | 426 intdata = (struct aim_odc_intdata *)conn->internal; |
431 | 427 |
432 return intdata->cookie; | 428 return intdata->cookie; |