Putting (bits1 | bits2) expression into a variable

aaron-schmidt · aaron-schmidt · commit 38ca59460091 · 2015-12-30T11:27:16.000+13:00
Fixes iOS 6.x bug described here: https://code.google.com/p/crypto-js/issues/detail?id=80
diff --git a/src/enc-base64.js b/src/enc-base64.js
@@ -90,7 +90,8 @@
                 if (i % 4) {
                     var bits1 = map.indexOf(base64Str.charAt(i - 1)) << ((i % 4) * 2);
                     var bits2 = map.indexOf(base64Str.charAt(i)) >>> (6 - (i % 4) * 2);
-                    words[nBytes >>> 2] |= (bits1 | bits2) << (24 - (nBytes % 4) * 8);
+                    var bitsCombined = bits1 | bits2;
+                    words[nBytes >>> 2] |= (bitsCombined) << (24 - (nBytes % 4) * 8);
                     nBytes++;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@`
`90`	`90`	`if (i % 4) {`
`91`	`91`	`var bits1 = map.indexOf(base64Str.charAt(i - 1)) << ((i % 4) * 2);`
`92`	`92`	`var bits2 = map.indexOf(base64Str.charAt(i)) >>> (6 - (i % 4) * 2);`
`93`		`- words[nBytes >>> 2] \|= (bits1 \| bits2) << (24 - (nBytes % 4) * 8);`
	`93`	`+ var bitsCombined = bits1 \| bits2;`
	`94`	`+ words[nBytes >>> 2] \|= (bitsCombined) << (24 - (nBytes % 4) * 8);`
`94`	`95`	`nBytes++;`
`95`	`96`	`}`
`96`	`97`	`}`