Changeset 501 for trunk/src/sh_static.c

Timestamp:

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

Author:

katerina

Message:

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

File:

• trunk/src/sh_static.c (modified) (6 diffs)

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