From: Tim Düsterhus <timwolla@googlemail.com>
Date: Wed, 11 Apr 2012 10:11:29 +0000 (+0300)
Subject: Correctly handle null in JSON
X-Git-Tag: 2.0.0_Beta_1~1157^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ebc57c5a809f64863a581c879b248542f170b5e3;p=GitHub%2FWoltLab%2FWCF.git

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 22d58becc4..baa6ad5466 100644
--- 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;
 	}