zlib: refactor to avoid unsafe array iteration

aduh95 · targos · commit 459fe6864ee6 · 2021-06-11T09:29:56.000+02:00
PR-URL: #36722 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Pooja D P <Pooja.D.P@ibm.com>
diff --git a/lib/zlib.js b/lib/zlib.js
@@ -23,6 +23,7 @@
 
 const {
 ArrayBuffer,
+ ArrayPrototypeForEach,
 ArrayPrototypeMap,
 ArrayPrototypePush,
 Error,
@@ -798,8 +799,8 @@ function Brotli(opts, mode) {
 assert(mode === BROTLI_DECODE || mode === BROTLI_ENCODE);
 
 TypedArrayPrototypeFill(brotliInitParamsArray, -1);
- if (opts && opts.params) {
- for (const origKey of ObjectKeys(opts.params)) {
+ if (opts?.params) {
+ ArrayPrototypeForEach(ObjectKeys(opts.params), (origKey) => {
 const key = +origKey;
 if (NumberIsNaN(key) || key < 0 || key > kMaxBrotliParam ||
 (brotliInitParamsArray[key] | 0) !== -1) {
@@ -812,7 +813,7 @@ function Brotli(opts, mode) {
 'number', opts.params[origKey]);
 }
 brotliInitParamsArray[key] = value;
- }
+ });
 }
 
 const handle = mode === BROTLI_DECODE ?

-Original file line number
+Diff line change
 const{
  ArrayBuffer,
 + ArrayPrototypeForEach,
  ArrayPrototypeMap,
  ArrayPrototypePush,
  Error,
 assert(mode===BROTLI_DECODE||mode===BROTLI_ENCODE);
 TypedArrayPrototypeFill(brotliInitParamsArray,-1);
 -if(opts&&opts.params){
 -for(constorigKeyofObjectKeys(opts.params)){
 +if(opts?.params){
 +ArrayPrototypeForEach(ObjectKeys(opts.params),(origKey)=>{
 constkey=+origKey;
 if(NumberIsNaN(key)||key<0||key>kMaxBrotliParam||
 (brotliInitParamsArray[key]|0)!==-1){
 'number',opts.params[origKey]);
+}
 brotliInitParamsArray[key]=value;
 -}
 +});
+}
 consthandle=mode===BROTLI_DECODE ?