Changeset 23012 for main/trunk/greenstone2/runtime-src/src/recpt/wizardaction.cpp

Timestamp:

2010-10-01T20:37:20+13:00 (14 years ago)

Author:

ak19

Message:

Fix to bug causing depositor to crash library.cgi upon selecting a collection: code was previously looping on parameter names in args to substring them in order to compare them to a prefix. However, it also tried to substring them when the arg parameter name was shorter than the prefix. Fix was necessary in two locations (wizardaction and depositoraction).

File:

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

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

@@ -118 +118 @@
       
       int prefix_len = macro_prefix.size();
-      
-      text_t args_prefix = substr(args_name.begin(),args_name.begin()+prefix_len);
-      
-      if (args_prefix == macro_prefix) {
-    saved_args[args_name] = args[args_name];
-      } 
+      int args_name_len = args_name.size();
+
+      if(args_name_len >= prefix_len) { // Only now can we substring args_name by prefix_len
+          text_t args_prefix;
+          if(args_name_len > prefix_len) { // substring
+            args_prefix = substr(args_name.begin(),args_name.begin()+prefix_len);
+          } else {
+            args_prefix = args_name;
+          }
+      
+          if (args_prefix == macro_prefix) {
+            saved_args[args_name] = args[args_name];
+          } 
+      }
       ++args_here;
     }