Changeset 501 for trunk

Timestamp:

Feb 29, 2016, 8:59:39 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #397 (regression in sh_static.c).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_static.c (modified) (6 diffs)
• test/testrun_2.sh (modified) (1 diff)

trunk/docs/Changelog

@@ +1 @@
+4.1.3:
+        * fix regression with '--enable-static' in sh_static.c
+          (reported by amaiket).
 4.1.2:
         * add options --enable-selinux and --enable-posix-acl for "hard fail"

trunk/src/sh_static.c

@@ -999 +999 @@
                 return -1;
 
-        while ((l = data[offset])) {
+        do {
 
                 if (offset < INT_MAX)
@@ -1005 +1005 @@
                 else
                         return -1;
+
+                l = data[offset];
 
                 if ((l & 0xc0) == (0xc0)) {
@@ -1018 +1020 @@
                 else
                   return -1;
-        }
+
+        } while (l);
 
         return offset - orig_offset;
@@ -1052 +1055 @@
                 if (offset < INT_MAX) offset++;
                 else return -1;
-                if (measure && (total < INT_MAX))
-                    total++;
+                if (measure)
+                    { if (total < INT_MAX) total++; else return -1; }
                 if ((l & 0xc0) == (0xc0)) {
-                        if (measure && (total < INT_MAX))
-                                total++;
+                        if (measure)
+                          { if (total < INT_MAX) total++; else return -1; }
                         /* compressed item, redirect */ 
                         offset = ((l & 0x3f) << 8) | data[offset];
@@ -1082 +1085 @@
                 else
                   return -1;
-                if (measure && (total <= (INT_MAX - l)))
-                        total += l;
+                if (measure)
+                  { if (total <= (INT_MAX -l)) total += l; else return -1; }
 
                 if (used == INT_MAX)
@@ -1094 +1097 @@
 
         /* The null byte must be counted too */
-        if (measure && (total < INT_MAX)) {
-            total++;
+        if (measure) {
+            if (total < INT_MAX) total++; else return -1; 
         }
 

trunk/test/testrun_2.sh

@@ -633 +633 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --quiet  $TRUST --enable-debug --enable-network=client  --enable-xml-log --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-encrypt=2
+        ${TOP_SRCDIR}/configure --quiet  $TRUST --enable-debug --enable-network=client  --enable-xml-log --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-encrypt=2 --enable-static
         #
         if test x$? = x0; then