projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc459e3
)
Fixed a null pointer comparison
author
Art Cancro
<ajc@citadel.org>
Fri, 29 Jul 2016 14:22:03 +0000
(10:22 -0400)
committer
Art Cancro
<ajc@citadel.org>
Fri, 29 Jul 2016 14:22:03 +0000
(10:22 -0400)
citadel/room_ops.c
patch
|
blob
|
history
diff --git
a/citadel/room_ops.c
b/citadel/room_ops.c
index 5b358b609bb88c175dc5c43b95964512e01aab95..c0221dde08d1e96688f515d2ae86fd59221cdced 100644
(file)
--- 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.
*/
/* 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;
}
vbuf.v_flags = vbuf.v_flags & ~V_FORGET & ~V_LOCKOUT;
vbuf.v_flags = vbuf.v_flags | V_ACCESS;
}