Changeset 23012

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).

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• depositoraction.cpp (modified) (1 diff)
• wizardaction.cpp (modified) (1 diff)

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

@@ -396 +396 @@
       text_t args_name = (*args_here).first;
       int prefix_len = macro_prefix.size();
-      text_t args_prefix = substr(args_name.begin(),args_name.begin()+prefix_len+3);
-
-      if (args_prefix == (macro_prefix+"md.")) {     
-    text_t args_val = args[args_name];
-    text_t args_suffix = substr(args_name.begin()+prefix_len+3,args_name.end()); 
-
-    text_tarray mdvalues;
-    splitchar (args_val.begin(), args_val.end(), ',', mdvalues);
-    int numvalues = mdvalues.size();
-
-    for (int i = 0; i < numvalues; ++i) {
-      if (!mdvalues[i].empty()) {         
-        decode_cgi_arg(mdvalues[i]);
-
-        if (cached_metadata_values == "") {
-          cached_metadata_values = "var CachedMDValues = new Array(\\{";
-        } else {
-          cached_metadata_values += ",";
-        }
-
-        cached_metadata_values += "\"" + args_name + "\":\"" + args_val + "\"";
+      int args_name_len = args_name.size();
+
+      if(args_name_len >= prefix_len+3) { // Only now can we substring args_name by prefix_len+3
+          text_t args_prefix;
+          if(args_name_len == prefix_len+3) {
+              args_prefix = args_name;
+          } else { // >, so substring
+              args_prefix = substr(args_name.begin(),args_name.begin()+prefix_len+3);
+          }
+
+          if (args_prefix == (macro_prefix+"md.")) {     
+            text_t args_val = args[args_name];
+            text_t args_suffix = substr(args_name.begin()+prefix_len+3,args_name.end()); 
+
+            text_tarray mdvalues;
+            splitchar (args_val.begin(), args_val.end(), ',', mdvalues);
+            int numvalues = mdvalues.size();
+
+            for (int i = 0; i < numvalues; ++i) {
+              if (!mdvalues[i].empty()) {         
+                decode_cgi_arg(mdvalues[i]);
+
+                if (cached_metadata_values == "") {
+                  cached_metadata_values = "var CachedMDValues = new Array(\\{";
+                } else {
+                  cached_metadata_values += ",";
+                }
+
+                cached_metadata_values += "\"" + args_name + "\":\"" + args_val + "\"";
+              }
+            }   
+          }
       }
-    }   
-      }
       ++args_here;
     }

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;
     }