Changeset 22942 for main

Timestamp:

2010-09-22T13:52:18+12:00 (14 years ago)

Author:

ak19

Message:

For ticket no 712 again. Tidier code in decode_commas function. Related to previous commit to fix a crash that occurred when using a combination of advanced and fielded searching - in an MGPP collection (server.exe and library.cgi would crash depending on which web server was used): 1. When parsing cgi args, arrays stem and fold contained the URL encodings percent-2-C rather than commas for delimiters and weren't split properly resulting in arrays of unexpected lengths (and values). Need to decode the percent-2-C to commas by calling decode_commas() in cgiutils.cpp before splitting. 2. decode_commas in cgiutils.cpp was performing an illegal iterator operation by attempting to peek PAST the end of the iterator which doesn't seem to be allowed by the STL code. When the iteration really got past the end, the iteration operation causes a problem resulting in a server.exe crash of its own.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp

@@ -412 +412 @@
   text_t::const_iterator end = intext.end ();
   
-  /*while (here != end) {
-    if (((here+2)<end) && *here == '%' && *(here+1) == '2'
-        && (*(here+2) == 'C' || *(here+2) == 'c')) {
-      here += 2;
-      outtext.push_back(',');
-      
-    }else outtext.push_back (*here);
-    ++here;
-  }
-  return outtext;*/
-
-  // iterators do not allow a forward increment/peek that goes past 
-  // iterator's end: tests like (here+2 <end) above cause errors if 
-  // the result ends up being > end. So have to test one character 
-  // at a time, since tests like (here != end) *are* allowed:
-
-  while (here != end) { // look for "%2C" to replace with ","
-     if(*here == '%') {
-         ++here;
-         if(here != end && *here == '2') {
-            ++here;
-            if(here != end && (*here == 'C' || *here == 'c')) {
+  // for loop
+  int intext_len = intext.size();
+  for(int i = 0; i < intext_len; i++) {
+      if ((i+2)<intext_len) {
+          if(intext[i] == '%' && intext[i+1] == '2'
+            && (intext[i+2] == 'C' || intext[i+2] == 'c')) {
+                i += 2;
                 outtext.push_back(',');
-            } else {
-                here -= 2;
-                outtext.push_back (*here);
-            }
-         } else { // go back to % char and push it back
-            --here;
-            outtext.push_back (*here);
-         }      
-     } else {
-        outtext.push_back (*here);
-     }
-
-     ++here;
-  } // end while
-  return outtext;
+                continue;
+          }
+      }
+      outtext.push_back (intext[i]);
+   }
+  return outtext; 
 }