From: pk910 <philipp@zoelle1.de>
Date: Sat, 3 Mar 2012 08:54:30 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.pk910.de:16110/srvx
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=d6bdd80f3ae9954463739bb7b2af649b7063ac30;hp=05fcb058c425829c77d8f9d39c7b7a5e3a8da9ae;p=srvx.git

Merge branch 'master' of ssh://git.pk910.de:16110/srvx
---

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;