From: Art Cancro <ajc@citadel.org>
Date: Fri, 29 Jul 2016 14:22:03 +0000 (-0400)
Subject: Fixed a null pointer comparison
X-Git-Tag: v939~663
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b8718a53d711c49fc15b0fb34358e05249db8578

Fixed a null pointer comparison
---

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 5b358b609..c0221dde0 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -811,8 +811,15 @@ void CtdlUserGoto(char *where, int display_result, int transiently,
 	/* Know the room ... but not if it's the page log room, or if the
 	 * caller specified that we're only entering this room transiently.
 	 */
-	if ((strcasecmp(CCC->room.QRname, CtdlGetConfigStr("c_logpages"))) && (transiently == 0))
-	{
+	int add_room_to_known_list = 1;
+	if (transiently == 1) {
+		add_room_to_known_list = 0;
+	}
+	char *c_logpages = CtdlGetConfigStr("c_logpages");
+	if ( (c_logpages != NULL) && (!strcasecmp(CCC->room.QRname, c_logpages)) ) {
+		add_room_to_known_list = 0;
+	}
+	if (add_room_to_known_list) {
 		vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
 		vbuf.v_flags = vbuf.v_flags | V_ACCESS;
 	}