# HG changeset patch # User Richard Laager # Date 1141696714 0 # Node ID ad33debf87b496bf57c570a0853be2eeb31886de # Parent dc05405864bda43db544b7747c3a7c51e365c931 [gaim-migrate @ 15793] Better NULL checking... Resolves CID 62: Event deref_ptr: Directly dereferenced pointer "wb" 75 if(wb->ui_data) Event check_after_deref: Pointer "wb" dereferenced before NULL check 86 if(wb) committer: Tailor Script diff -r dc05405864bd -r ad33debf87b4 src/whiteboard.c --- a/src/whiteboard.c Tue Mar 07 01:56:29 2006 +0000 +++ b/src/whiteboard.c Tue Mar 07 01:58:34 2006 +0000 @@ -72,6 +72,8 @@ void gaim_whiteboard_destroy(GaimWhiteboard *wb) { + g_return_if_fail(wb != NULL); + if(wb->ui_data) { /* Destroy frontend */ @@ -83,15 +85,9 @@ if(wb->prpl_ops && wb->prpl_ops->end) wb->prpl_ops->end(wb); - if(wb) - { - if(wb->who) - g_free(wb->who); - - wbList = g_list_remove(wbList, wb); - - g_free(wb); - } + g_free(wb->who); + wbList = g_list_remove(wbList, wb); + g_free(wb); } void gaim_whiteboard_start(GaimWhiteboard *wb)