From: Richard L. <rl...@us...> - 2006-03-07 07:24:52
|
Update of /cvsroot/gaim/gaim/src/protocols/novell In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20812 Modified Files: nmconference.c Log Message: Resolves CID 75: Event deref_ptr: Directly dereferenced pointer "conference" 75 gaim_debug(GAIM_DEBUG_INFO, "novell", 76 "In release conference %p, refs=%d\n", 77 conference, conference->ref_count); Event check_after_deref: Pointer "conference" dereferenced before NULL check 78 if (conference != NULL && (--conference->ref_count == 0)) { Index: nmconference.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/novell/nmconference.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -p -r1.3 -r1.4 --- nmconference.c 15 May 2004 14:00:30 -0000 1.3 +++ nmconference.c 7 Mar 2006 07:24:50 -0000 1.4 @@ -72,10 +72,12 @@ nm_release_conference(NMConference * con { GSList *node; + g_return_if_fail(conference != NULL); + gaim_debug(GAIM_DEBUG_INFO, "novell", "In release conference %p, refs=%d\n", conference, conference->ref_count); - if (conference != NULL && (--conference->ref_count == 0)) { + if (--conference->ref_count == 0) { gaim_debug(GAIM_DEBUG_INFO, "novell", "Releasing conference %p, total=%d\n", |