Make parseJson safer

2015-03-07 19:01:54 +00:00 · 2015-03-07 19:01:54 +00:00 · e79d067690
parent b80038804f
commit e79d067690
1 changed files with 3 additions and 0 deletions
--- a/src/Composer/Json/JsonFile.php
+++ b/src/Composer/Json/JsonFile.php
@ -253,6 +253,9 @@ class JsonFile
     */
    public static function parseJson($json, $file = null)
    {
+        if (null === $json) {
+            return;
+        }
        $data = json_decode($json, true);
        if (null === $data && JSON_ERROR_NONE !== json_last_error()) {
            self::validateSyntax($json, $file);