Changeset 81

Timestamp:

Jan 13, 2007, 8:29:53 PM (18 years ago)

Author:

rainer

Message:

Fixes a bug in sh_database.c introduced in changeset [78].

Location:

trunk

Files:

• src/sh_database.c (modified) (2 diffs)
• src/sh_tools.c (modified) (1 diff)
• test/testrun_1b.sh (modified) (1 diff)
• test/testrun_2c.sh (modified) (1 diff)

trunk/src/sh_database.c

@@ -1535 +1535 @@
       do 
         {
-          if (*p <=  0x7F)
+          if (*p <=  126 && *p >= 32)
             {
               if (escp == 0)
                 {
-                  if      (!((*p == '\'') || (*p == '\"') || (*p != '\\'))) 
+                  if      (!((*p == '\'') || (*p == '\"') || (*p == '\\'))) 
                     /* do nothing */;
-                  else if (*p == '\\') escp = 1;
-                  else    retv = S_FALSE; /* (*p == '\'' || *p == '\"') */
+                  else if (*p == '\\') 
+                    escp = 1;
+                  else  
+                    retv = S_FALSE; /* (*p == '\'' || *p == '\"') */
                 }
               else /* escp == 1 */
@@ -1549 +1551 @@
                 }
             }
-          else /* *p > 0x7F */
+          else /* *p > 126 || *p < 32 */
             {
               retv = S_FALSE;

trunk/src/sh_tools.c

@@ -213 +213 @@
           ++p;
               
-          if (c < 31 || c > 126)
+          if (c < 32 || c > 126)
             {
               --i;

trunk/test/testrun_1b.sh

@@ -180 +180 @@
     #
     tmp=`egrep 'File original:.*name=etc.*path=/etc' test_log_prelude 2>/dev/null | wc -l`
-    if [ $tmp -ne 1 ]; then
+    if [ $tmp -lt 1 ]; then
         [ -z "$verbose" ] || log_msg_fail "/etc";
     fi
     tmp=`egrep 'Classification text: Checking' test_log_prelude 2>/dev/null | wc -l`
-    if [ $tmp -ne 1 ]; then
+    if [ $tmp -lt 1 ]; then
         [ -z "$verbose" ] || log_msg_fail "checking";
     fi
     tmp=`egrep 'Classification text: Checking' test_log_prelude 2>/dev/null | wc -l`
-    if [ $tmp -ne 1 ]; then
+    if [ $tmp -lt 1 ]; then
         [ -z "$verbose" ] || log_msg_fail "checking";
     fi

trunk/test/testrun_2c.sh

@@ -28 +28 @@
 
     rm -f test_log_db
+    #
     echo "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '"${DATE}"';" | mysql --password=samhain -u samhain samhain >test_log_db
     #