Merge pull request brix#87 from evilboxingdragonslayer/develop

fixed infinite loop bug in zero padding unpad
bnchaofeng · Sep 13, 2018 · 4b7673e · 4b7673e
2 parents 52f7128 + 5bfe6d5
commit 4b7673e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/pad-zeropadding.js b/src/pad-zeropadding.js
@@ -17,9 +17,11 @@ CryptoJS.pad.ZeroPadding = {
 
         // Unpad
         var i = data.sigBytes - 1;
-        while (!((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
-            i--;
+        for (var i = data.sigBytes - 1; i >= 0; i--) {
+            if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+                data.sigBytes = i + 1;
+                break;
+            }
         }
-        data.sigBytes = i + 1;
     }
 };