Fix issue with false passed to combineResults

MattIPv4 · Feb 14, 2021 · 4f9c20b · 4f9c20b
1 parent 7b9e9ba
commit 4f9c20b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "web-whois",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "description": "Perform RDAP/WHOIS lookups over HTTP",
     "main": "src/index.js",
     "keywords": [],

diff --git a/src/index.js b/src/index.js
@@ -6,8 +6,9 @@ const { consistentResultObj, consistentResult } = require('./util');
 const combineResults = dataArr => {
     const result = {};
     for (const data of dataArr)
-        for (const key of data)
-            if (data[key] && !result[key]) result[key] = data[key];
+        for (const key in data)
+            if (Object.prototype.hasOwnProperty.call(data, key))
+                if (data[key] && !result[key]) result[key] = data[key];
     return consistentResult(consistentResultObj(result));
 };
 
@@ -31,5 +32,5 @@ module.exports = async (query, first = false) => {
     if (cfwho && first) return cfwho;
 
     // Combine the results (preferring RDAP, WHOIS, then cfwho)
-    return combineResults([rdap, whois, cfwho]);
+    return combineResults([rdap || {}, whois || {}, cfwho || {}]);
 };