Changeset 23635 for main/trunk/greenstone2/runtime-src

Timestamp:

2011-01-25T18:15:15+13:00 (13 years ago)

Author:

ak19

Message:

Fixed a bug that cased library.cgi to crash (apache and server.exe): the now-corrected order of the tests in the while condition matter.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/querytools.cpp (modified) (2 diffs)

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

@@ -407 +407 @@
       query_no_brackets += substr(here, bracket);
       // skip the :TI bits
-      while (*bracket != ' ' && bracket != end) { bracket++;}
+      while (bracket != end     // do bracket != end test first, ELSE when bracket = end, we're past the string, in
+          && *bracket != ' ') { // which case *bracket becomes an invalid operation that causes the server to crash
+            bracket++;
+      }
       here = bracket;
     }
@@ -418 +421 @@
       // back up the field name
       text_t::const_iterator old_bracket = bracket;
-      while (*bracket != ' ' && bracket != here) {
-    --bracket;
+      while (bracket != here && *bracket != ' ') {  // order of tests in condition matters (see long comment above)
+    --bracket;                      
       }
       if (bracket != here) {