Correctly handle null in JSON

diff --git a/wcfsetup/install/files/lib/util/JSON.class.php b/wcfsetup/install/files/lib/util/JSON.class.php
index 22d58becc4bd9bba0ef3ac3b148522fb9193c902..baa6ad54660e8649f2ce4a7e2f810ba67e2d30b9 100644 (file)
--- a/wcfsetup/install/files/lib/util/JSON.class.php
+++ b/wcfsetup/install/files/lib/util/JSON.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\util;
+use wcf\system\exception\SystemException;
 
 /**
  * Provides methods for JSON.
@@ -33,6 +34,10 @@ final class JSON {
                // decodes JSON
                $data = json_decode($json, $asArray);
                
+               if ($data === null && self::getLastError() !== JSON_ERROR_NONE) {
+                       throw new SystemException('Could not decode JSON "'.$json.'"');
+               }
+               
                return $data;
        }