From: Dave West <davew@uncensored.citadel.org>
Date: Fri, 24 Aug 2007 09:26:02 +0000 (+0000)
Subject: Patches from Matt.
X-Git-Tag: v7.86~3117
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=c783f8ef2dc9fc09057f7c38863dc824fb3a6c29;p=citadel.git

Patches from Matt.
---

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 0c5b3c3b5..517865409 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -863,6 +863,8 @@ void gotonext(void)
 		 */
 		mptr = (struct march *) malloc(sizeof(struct march));
 		mptr->next = NULL;
+		mptr->march_order = 0;
+	    	mptr->march_floor = 0;
 		strcpy(mptr->march_name, "_BASEROOM_");
 		if (WC->march == NULL) {
 			WC->march = mptr;
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 16532ef2b..758d5b5aa 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -35,7 +35,7 @@ void unescape_input(char *buf)
 
 	buflen = strlen(buf);
 
-	while ((isspace(buf[buflen - 1])) && (buflen > 0)){
+	while ((buflen > 0) && (isspace(buf[buflen - 1]))){
 		buf[buflen - 1] = 0;
 		buflen --;
 	}