readline: check for null input in question()

cjihrig · targos · commit 3d64d2b5efd0 · 2021-02-02T10:47:41.000+01:00
question() checks for objects passed as the recently added options argument. This commit improves that logic to also check for null. PR-URL: #37089 Reviewed-By: Zijian Liu <lxxyxzj@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com>
diff --git a/lib/readline.js b/lib/readline.js
@@ -364,7 +364,7 @@ Interface.prototype.prompt = function(preserveCursor) {
 
 Interface.prototype.question = function(query, options, cb) {
 cb = typeof options === 'function' ? options : cb;
- options = typeof options === 'object' ? options : {};
+ options = typeof options === 'object' && options !== null ? options : {};
 
 if (options.signal) {
 options.signal.addEventListener('abort', () => {
@@ -385,7 +385,7 @@ Interface.prototype.question = function(query, options, cb) {
 };
 
 Interface.prototype.question[promisify.custom] = function(query, options) {
- options = typeof options === 'object' ? options : {};
+ options = typeof options === 'object' && options !== null ? options : {};
 
 return new Promise((resolve, reject) => {
 this.question(query, options, resolve);

-Original file line number
+Diff line change
 Interface.prototype.question=function(query,options,cb){
 cb=typeofoptions==='function' ? options : cb;
 -options=typeofoptions==='object' ? options : {};
 +options=typeofoptions==='object'&&options!==null? options : {};
 if(options.signal){
 options.signal.addEventListener('abort',()=>{
 };
 Interface.prototype.question[promisify.custom]=function(query,options){
 -options=typeofoptions==='object' ? options : {};
 +options=typeofoptions==='object'&&options!==null? options : {};
 returnnewPromise((resolve,reject)=>{
 this.question(query,options,resolve);