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

Timestamp:

2010-04-27T12:36:54+12:00 (14 years ago)

Author:

mdewsnip

Message:

Added call to reset() on the inconverter before converting each CGI argument in args_tounicode(), to prevent problems (infinite loops) when converting the last argument left the converter in a bad state.

File:

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

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

@@ -826 +826 @@
   while (here != end) {
     if ((*here).second.value.getencoding() > 0) {
+      // Call reset() before converting each argument, to prevent problems when converting the last
+      //   argument left the converter in a bad state
+      inconvert.reset();
       (*here).second.value = inconvert.convert((*here).second.value);
     }