* sanitize the next message pointer loop in the "Goto Next Room"-Call

* include missing header.

diff --git a/webcit/messages.c b/webcit/messages.c
index 3f939757ee7436e5b5fb1535f26313b57bc70811..073edb85dfe38a8c85a1b5c36db55ba52dd4d79b 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -2009,6 +2009,10 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                                safestrncpy(WC->summ[nummsgs-1].subj,
                                        _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
                                if (!IsEmptyStr(fullname)) {
+#ifdef HAVE_ICONV
+                               /** Handle senders with RFC2047 encoding */
+                                       utf8ify_rfc822_string(fullname);
+#endif
                                        safestrncpy(WC->summ[nummsgs-1].from,
                                                fullname, sizeof WC->summ[nummsgs-1].from);
                                }

diff --git a/webcit/roomops.c b/webcit/roomops.c
index ee44b7622ba98bdc6e429df507e6cd3f94150e3b..fcbbf368aefc84748e11511009ca1532147011a8 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -4,7 +4,7 @@
  */
 
 #include "webcit.h"
-
+#include "webserver.h"
 #define MAX_FLOORS 128
 char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
 
@@ -841,6 +841,7 @@ void gotonext(void)
        struct march *mptr, *mptr2;
        char room_name[128];
        char next_room[128];
+       int ELoop = 0;
 
        /**
         * First check to see if the march-mode list is already allocated.
@@ -852,6 +853,14 @@ void gotonext(void)
                serv_getln(buf, sizeof buf);
                if (buf[0] == '1')
                        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                               if (IsEmptyStr(buf)) {
+                                       if (ELoop > 10000)
+                                               return;
+                                       if (ELoop % 100 == 0)
+                                               sleeeeeeeeeep(1);
+                                       ELoop ++;
+                                       continue;                                       
+                               }
                                extract_token(room_name, buf, 0, '|', sizeof room_name);
                                if (strcasecmp(room_name, WC->wc_roomname)) {
                                        mptr = (struct march *) malloc(sizeof(struct march));
@@ -859,15 +868,13 @@ void gotonext(void)
                                        safestrncpy(mptr->march_name, room_name, sizeof mptr->march_name);
                                        mptr->march_floor = extract_int(buf, 2);
                                        mptr->march_order = extract_int(buf, 3);
-                                       if (WC->march == NULL) {
+                                       if (WC->march == NULL) 
                                                WC->march = mptr;
-                                       } else {
-                                               mptr2 = WC->march;
-                                               while (mptr2->next != NULL)
-                                                       mptr2 = mptr2->next;
+                                       else 
                                                mptr2->next = mptr;
-                                       }
+                                       mptr2 = mptr;
                                }
+                               buf[0] = '\0';
                        }
                /**
                 * add _BASEROOM_ to the end of the march list, so the user will end up