Changeset 18824

Timestamp:

2009-03-27T17:08:43+13:00 (15 years ago)

Author:

mdewsnip

Message:

Fixed get_cookie() so that it checks that cookiestring isn't empty before trying to fiddle with it, to prevent crashes on Windows.

File:

• gsdl/trunk/runtime-src/src/recpt/receptionist.cpp (modified) (1 diff)

gsdl/trunk/runtime-src/src/recpt/receptionist.cpp

@@ -674 +674 @@
 
   text_t cookiestring = gsdl_getenv ("HTTP_COOKIE", fcgienv);
-
-  text_t::const_iterator end = cookiestring.end();  
-  text_t::const_iterator here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
-
-  while (here+9 < end) { 
+  if (!cookiestring.empty())
+  {
+    text_t::const_iterator end = cookiestring.end();  
+    text_t::const_iterator here = findchar ((text_t::const_iterator)cookiestring.begin(), end, 'G');
+
+    while (here+9 < end) { 
     
-    if (substr(here, here+8) == "GSDL_UID") {
-      cookie = substr (here+9, findchar (here+9, end, ';')); 
-      return true;
-    }
-    ++here;
-    here = findchar (here, end, 'G');
+      if (substr(here, here+8) == "GSDL_UID") {
+    cookie = substr (here+9, findchar (here+9, end, ';')); 
+    return true;
+      }
+      ++here;
+      here = findchar (here, end, 'G');
+    }
   }