Assert that existingMapping is an array.

Signed-off-by: Daniel Kesselberg <[email protected]>
jhass · Feb 26, 2020 · 3a5ca0c · 3a5ca0c
1 parent 6742d2f
commit 3a5ca0c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/keeweb/lib/Migration/RegisterMimeType.php b/keeweb/lib/Migration/RegisterMimeType.php
@@ -26,7 +26,7 @@ private function registerForNewFiles()
 
         if (file_exists($mappingFile)) {
             $existingMapping = json_decode(file_get_contents($mappingFile), true);
-            if (json_last_error() === JSON_ERROR_NONE) {
+            if (json_last_error() === JSON_ERROR_NONE && is_array($existingMapping)) {
                 $mapping = array_merge($existingMapping, $mapping);
             }
         }

diff --git a/keeweb/lib/Migration/UnregisterMimeType.php b/keeweb/lib/Migration/UnregisterMimeType.php
@@ -25,7 +25,7 @@ private function unregisterForNewFiles()
 
         if (file_exists($mappingFile)) {
             $mapping = json_decode(file_get_contents($mappingFile), true);
-            if (json_last_error() === JSON_ERROR_NONE) {
+            if (json_last_error() === JSON_ERROR_NONE && is_array($mapping)) {
                 unset($mapping['kdbx']);
             } else {
                 $mapping = [];