Patches from Matt.

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 0c5b3c3b56178e94b513521de6be0326896c368d..51786540942c92e3ef9554835e22625d5d393784 100644 (file)
--- 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 16532ef2bcb25e6f681a5a5dbca13cff51aec2c4..758d5b5aad61301b79115b393e14eb0c7e2a190d 100644 (file)
--- 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 --;
        }