lib: support ranges in validateInt32()

cjihrig · targos · commit 36e5100a394d · 2018-06-13T08:41:48.000+02:00
This commit adds minimum and maximum value checks to the validateInt32() validator. PR-URL: #20588 Fixes: #20498 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Weijia Wang <starkwang@126.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Backport-PR-URL: #21172
diff --git a/lib/internal/validators.js b/lib/internal/validators.js
@@ -63,18 +63,22 @@ function validateInteger(value, name) {
 }
 
 function validateInt32(value, name, min = -2147483648, max = 2147483647) {
+  // The defaults for min and max correspond to the limits of 32-bit integers.
   if (!isInt32(value)) {
     let err;
     if (typeof value !== 'number') {
       err = new ERR_INVALID_ARG_TYPE(name, 'number', value);
     } else if (!Number.isInteger(value)) {
       err = new ERR_OUT_OF_RANGE(name, 'an integer', value);
     } else {
-      // 2 ** 31 === 2147483648
-      err = new ERR_OUT_OF_RANGE(name, '> -2147483649 && < 2147483648', value);
+      err = new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
     }
     Error.captureStackTrace(err, validateInt32);
     throw err;
+  } else if (value < min || value > max) {
+    const err = new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
+    Error.captureStackTrace(err, validateInt32);
+    throw err;
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,18 +63,22 @@ function validateInteger(value, name) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`function validateInt32(value, name, min = -2147483648, max = 2147483647) {`
	`66`	`+ // The defaults for min and max correspond to the limits of 32-bit integers.`
`66`	`67`	`if (!isInt32(value)) {`
`67`	`68`	`let err;`
`68`	`69`	`if (typeof value !== 'number') {`
`69`	`70`	`err = new ERR_INVALID_ARG_TYPE(name, 'number', value);`
`70`	`71`	`} else if (!Number.isInteger(value)) {`
`71`	`72`	`err = new ERR_OUT_OF_RANGE(name, 'an integer', value);`
`72`	`73`	`} else {`
`73`		`- // 2 ** 31 === 2147483648`
`74`		`- err = new ERR_OUT_OF_RANGE(name, '> -2147483649 && < 2147483648', value);`
	`74`	+ err = new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
`75`	`75`	`}`
`76`	`76`	`Error.captureStackTrace(err, validateInt32);`
`77`	`77`	`throw err;`
	`78`	`+ } else if (value < min \|\| value > max) {`
	`79`	+ const err = new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value);
	`80`	`+ Error.captureStackTrace(err, validateInt32);`
	`81`	`+ throw err;`
`78`	`82`	`}`
`79`	`83`	`}`
`80`	`84`