Changeset 7290

Timestamp:

18/03/11 19:54:48 (14 months ago)

Author:

westram

Message:

• GB_command_interpreter
  • when ACI contained backslashes, unescaping was wrong (resulting in buffer overflow)
  • nevertheless results from 'contains' (or maybe more ACI commands) may be wrong now (since they worked "correct" with wrong escaping)

Files:

• branches/dev/ARBDB/adquery.cxx (modified) (4 diffs)

branches/dev/ARBDB/adquery.cxx

@@ -941 +941 @@
                 if (c=='\\') {
                     *(s2++) = c;
-                    if (!(c=*s1)) { break; }
+                    if (!(c=*++s1)) { break; }
                     *(s2++) = c;
                     continue;
@@ -1008 +1008 @@
             }
             else {
-                int argcparam = 0;
-                char *bracket = strchr(s1, '(');
+                int   argcparam = 0;
+                char *bracket   = strchr(s1, '(');
+
                 if (bracket) {      // I got the parameter list
                     int slen;
@@ -1181 +1182 @@
 #include <arbdbt.h>
 
-#define TEST_CI(input,cmd,expected) do {                               \
-        char *result; \
+#define TEST_CI__INTERNAL(input,cmd,expected,TEST_RESULT) do {          \
+        char *result;                                                   \
         TEST_ASSERT_RESULT__NOERROREXPORTED(result = GB_command_interpreter(gb_main, input, cmd, gb_data, NULL)); \
-        TEST_ASSERT_EQUAL(result,expected);                             \
+        TEST_RESULT(result,expected);                                   \
         free(result);                                                   \
     } while(0)
+
+
+#define TEST_CI(input,cmd,expected)         TEST_CI__INTERNAL(input,cmd,expected,TEST_ASSERT_EQUAL)
+#define TEST_CI__BROKEN(input,cmd,expected) TEST_CI__INTERNAL(input,cmd,expected,TEST_ASSERT_EQUAL__BROKEN)
 
 #define TEST_CI_ERROR(input,cmd,error_expected) do {                    \
@@ -1228 +1233 @@
 
         // escaping (@@@ wrong behavior?)
-        TEST_CI("b\\a",   "|count(\\a)",    "2");   // i would expect '1' as result (the 'a'), but it counts '\\' and 'a'
-        TEST_CI("b\\a",   "|contains(\\)",    "0"); // searches for 2 backslashes (should search for one)
-        TEST_CI("b\\a",   "|contains(\"\\\\\")",    "0"); // searches for 2 backslashes
+        TEST_CI("b\\a",   "|count(\\a)",         "2"); // i would expect '1' as result (the 'a'), but it counts '\\' and 'a'
+        TEST_CI("b\\a",   "|contains(\"\\\\\")", "0"); // searches for 2 backslashes(ok)
+        TEST_CI__BROKEN("b\\a", "|contains(\\)", "1"); // searches for 1 backslash (ok), but reports two hits instead of one
+        TEST_CI__BROKEN("b\\\\a", "|contains(\"\\\\\")", "1"); // searches for 2 backslashes (ok), but reports two hits instead of one
         TEST_CI_ERROR("b\\a", "|contains(\"\\\")", "ARB ERROR: unbalanced '\"' in '|contains(\"\\\")'"); // raises error (should searches for 1 backslash)