Avoid crashes due to broken map data

Hypfer · Mar 23, 2019 · e136443 · e136443
1 parent 053fa00
commit e136443
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/lib/Tools.js b/lib/Tools.js
@@ -454,10 +454,16 @@ const Tools = {
                                                     if (err) {
                                                         callback(err);
                                                     } else {
-                                                        callback(null, {
-                                                            mapData: Tools.PARSE_PPM_MAP(unzippedFile),
-                                                            log: log,
-                                                        })
+                                                        var parsedMapData = Tools.PARSE_PPM_MAP(unzippedFile);
+
+                                                        if(parsedMapData.map.length === 0) {
+                                                            callback(new Error("No usable map data found"));
+                                                        } else {
+                                                            callback(null, {
+                                                                mapData: parsedMapData,
+                                                                log: log,
+                                                            })
+                                                        }
                                                     }
                                                 });
                                             }
@@ -526,15 +532,13 @@ const Tools = {
     PARSE_PPM_MAP: function (buf) {
         const map = [];
 
-        if (buf.length === CORRECT_PPM_MAP_FILE_SIZE) {
-            for (let i = 17, j = 0; i <= buf.length - 16; i += 3, j++) {
-                let r = buf.readUInt8(i);
-                let g = buf.readUInt8(i + 1);
-                let b = buf.readUInt8(i + 2);
+        for (let i = 17, j = 0; i <= buf.length - 16; i += 3, j++) {
+            let r = buf.readUInt8(i);
+            let g = buf.readUInt8(i + 1);
+            let b = buf.readUInt8(i + 2);
 
-                if (!(r === 125 && g === 125 && b === 125)) {
-                    map.push([j + j * 3, r, g, b])
-                }
+            if (!(r === 125 && g === 125 && b === 125)) {
+                map.push([j + j * 3, r, g, b])
             }
         }