Putting (bits1 | bits2) expression into a variable (fix for iOS 6 bug)

aaron-schmidt · web-flow · commit 7e4cf2f308a3 · 2017-07-24T13:19:07.000+12:00
Previously fixed here: brix#40 More info: https://github.com/Runscope/crypto-js/issues/80
diff --git a/src/enc-base64.js b/src/enc-base64.js
@@ -106,7 +106,8 @@
           if (i % 4) {
               var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
               var bits2 = reverseMap[base64Str.charCodeAt(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
`@@ -106,7 +106,8 @@`
`106`	`106`	`if (i % 4) {`
`107`	`107`	`var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);`
`108`	`108`	`var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);`
`109`		`- words[nBytes >>> 2] \|= (bits1 \| bits2) << (24 - (nBytes % 4) * 8);`
	`109`	`+ var bitsCombined = bits1 \| bits2;`
	`110`	`+ words[nBytes >>> 2] \|= bitsCombined << (24 - (nBytes % 4) * 8);`
`110`	`111`	`nBytes++;`
`111`	`112`	`}`
`112`	`113`	`}`