From b8718a53d711c49fc15b0fb34358e05249db8578 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 29 Jul 2016 10:22:03 -0400 Subject: [PATCH] Fixed a null pointer comparison --- citadel/room_ops.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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; } -- 2.30.2