Changeset 26294

Timestamp:

2012-10-08T18:53:33+13:00 (12 years ago)

Author:

ak19

Message:

Fix to server crashing bugs. Diego reported a bug when searching on partial numerical values like dates of the form 28-02-2012 (spotted in collections of simple html files). Search results are returned, but clicking a resulting document crashes the server. During testing, it turned out that an alphanumeric string that I tried also caused the same problem in another part of the same code (same cpp file), so I fixed it in multiple places: it was going past the array.

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/text/GSDLQueryLex.cpp (modified) (3 diffs)

main/trunk/greenstone2/common-src/indexers/mgpp/text/GSDLQueryLex.cpp

@@ -53 +53 @@
   if (c == '+') {
     AddNChar (here, el.text, charLen);
-    charLen = parse_utf8_char (&*here, endMinus1, &c);
+    if(here != end) {
+        charLen = parse_utf8_char (&*here, endMinus1, &c);
+    }
   } else if (c == '-') {
     neg = true;
     AddNChar (here, el.text, charLen);
-    charLen = parse_utf8_char (&*here, endMinus1, &c);
+    if(here != end) {   
+        charLen = parse_utf8_char (&*here, endMinus1, &c);
+    }
   }
 
@@ -68 +72 @@
     el.num = el.num*10 + c - '0';
     AddNChar (here, el.text, charLen);
-    charLen = parse_utf8_char (&*here, endMinus1, &c);
+    if(here == end) {
+        break;
+    } else {
+        charLen = parse_utf8_char (&*here, endMinus1, &c);
+    }
   }
 
@@ -131 +139 @@
     AddNChar (here, el.text, charLen);
     length += charLen;
-    charLen = parse_utf8_char (&*here, endMinus1, &c);
+    if(here == end) { 
+        break; 
+    } else {
+        charLen = parse_utf8_char (&*here, endMinus1, &c);
+    }
   }