From 7078de864edb36df047c3b11d90f2fe47353e8dd Mon Sep 17 00:00:00 2001
From: pk910 <philipp@zoelle1.de>
Date: Sat, 3 Mar 2012 09:53:35 +0100
Subject: [PATCH] tidied up advtopic code

---
 src/chanserv.c | 4 ++--
 src/chanserv.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chanserv.c b/src/chanserv.c
index d50c914..4e41784 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -4446,7 +4446,6 @@ static CHANSERV_FUNC(cmd_topic)
                             new_topic[dpos++] = *ptr; //is % again
                             break;
                         }
-                        ptr--;
                         advtopic_index--; //no zero base
                         if(!cData->advtopic[advtopic_index])
                             break; //just leave it empty
@@ -4458,11 +4457,12 @@ static CHANSERV_FUNC(cmd_topic)
                         break;
                     case '\\': 
                         ptr++; /* and fall through */
+                        if(!*ptr) break;
                     default:
                         new_topic[dpos++] = *ptr;
+                        ptr++;
                         break;
                     }
-                    ptr++;
                 }
             } else {
                 while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN))
diff --git a/src/chanserv.h b/src/chanserv.h
index 2aba69c..638a77f 100644
--- a/src/chanserv.h
+++ b/src/chanserv.h
@@ -109,7 +109,7 @@ struct chanData
     unsigned short      lvlOpts[NUM_LEVEL_OPTIONS];
     unsigned char       chOpts[NUM_CHAR_OPTIONS];
 
-    char *advtopic[9];
+    char *advtopic[MAXADVTOPICENTRIES];
 
     struct userData     *users;
     struct banData      *bans;
-- 
2.20.1