summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-05-04 23:01:49 +0800
committerin2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-05-04 23:01:49 +0800
commit63b324b6a0b428f59b63056f4cc6ae1bca69c3f7 (patch)
tree23ad495ee0e499ab762b7e30e57b31929a2632fe
parent923905e83ad2d075f0d40125e8acbd0ca88ea938 (diff)
downloadpttbbs-63b324b6a0b428f59b63056f4cc6ae1bca69c3f7.tar
pttbbs-63b324b6a0b428f59b63056f4cc6ae1bca69c3f7.tar.gz
pttbbs-63b324b6a0b428f59b63056f4cc6ae1bca69c3f7.tar.bz2
pttbbs-63b324b6a0b428f59b63056f4cc6ae1bca69c3f7.tar.lz
pttbbs-63b324b6a0b428f59b63056f4cc6ae1bca69c3f7.tar.xz
pttbbs-63b324b6a0b428f59b63056f4cc6ae1bca69c3f7.tar.zst
pttbbs-63b324b6a0b428f59b63056f4cc6ae1bca69c3f7.zip
avoid SHM->bsorted[type][n] == NULL
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1922 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/board.c3
-rw-r--r--util/boardlist.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/mbbsd/board.c b/mbbsd/board.c
index f18c6d50..37bf9700 100644
--- a/mbbsd/board.c
+++ b/mbbsd/board.c
@@ -131,8 +131,7 @@ load_uidofgid(const int gid, const int type)
int n, childcount = 0;
currbptr = &bcache[gid - 1];
for (n = 0; n < numboards; ++n) {
- bptr = SHM->bsorted[type][n];
- if (bptr->brdname[0] == '\0')
+ if( !(bptr = SHM->bsorted[type][n]) || bptr->brdname[0] == '\0' )
continue;
if (bptr->gid == gid) {
if (currbptr == &bcache[gid - 1])
diff --git a/util/boardlist.c b/util/boardlist.c
index a37de82f..606a0192 100644
--- a/util/boardlist.c
+++ b/util/boardlist.c
@@ -9,8 +9,7 @@ load_uidofgid(const int gid, const int type)
int n, childcount = 0;
currbptr = &bcache[gid - 1];
for (n = 0; n < numboards; ++n) {
- bptr = SHM->bsorted[type][n];
- if (bptr->brdname[0] == '\0')
+ if( !(bptr = SHM->bsorted[type][n]) || bptr->brdname[0] == '\0' )
continue;
if (bptr->gid == gid) {
if (currbptr == &bcache[gid - 1])