# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1141716290 0
# Node ID 11742521716f14b5c2fc89d1b976b0e7616ac520
# Parent  068282089843f9d32c7b050b9051e6171cd53fcc
[gaim-migrate @ 15814]
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)) {

committer: Tailor Script <tailor@pidgin.im>

diff -r 068282089843 -r 11742521716f src/protocols/novell/nmconference.c
--- a/src/protocols/novell/nmconference.c	Tue Mar 07 07:23:04 2006 +0000
+++ b/src/protocols/novell/nmconference.c	Tue Mar 07 07:24:50 2006 +0000
@@ -72,10 +72,12 @@
 {
 	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",