comparison src/protocols/msn/servconn.c @ 6827:1cfbb731aa1f

[gaim-migrate @ 7372] Several fixes for attempted NULL pointer frees, and some MSNSLP fixes. Still not ready for use yet. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sun, 14 Sep 2003 01:59:09 +0000
parents 2adf21e70601
children bd433a45a463
comparison
equal deleted inserted replaced
6826:2adf21e70601 6827:1cfbb731aa1f
241 if (servconn->inpa) 241 if (servconn->inpa)
242 gaim_input_remove(servconn->inpa); 242 gaim_input_remove(servconn->inpa);
243 243
244 close(servconn->fd); 244 close(servconn->fd);
245 245
246 g_free(servconn->rxqueue); 246 if (servconn->rxqueue != NULL)
247 g_free(servconn->rxqueue);
247 248
248 while (servconn->txqueue != NULL) { 249 while (servconn->txqueue != NULL) {
249 g_free(servconn->txqueue->data); 250 g_free(servconn->txqueue->data);
250 251
251 servconn->txqueue = g_slist_remove(servconn->txqueue, 252 servconn->txqueue = g_slist_remove(servconn->txqueue,
334 size_t 335 size_t
335 msn_servconn_write(MsnServConn *servconn, const char *buf, size_t size) 336 msn_servconn_write(MsnServConn *servconn, const char *buf, size_t size)
336 { 337 {
337 g_return_val_if_fail(servconn != NULL, 0); 338 g_return_val_if_fail(servconn != NULL, 0);
338 339
340 #if 0
339 gaim_debug(GAIM_DEBUG_MISC, "msn", "C: %s%s", buf, 341 gaim_debug(GAIM_DEBUG_MISC, "msn", "C: %s%s", buf,
340 (*(buf + size - 1) == '\n' ? "" : "\n")); 342 (*(buf + size - 1) == '\n' ? "" : "\n"));
343 #endif
341 344
342 return write(servconn->fd, buf, size); 345 return write(servconn->fd, buf, size);
343 } 346 }
344 347
345 gboolean 348 gboolean