From b0cd13e3bbe4ff91cf9e5de012898c055e70bac9 Mon Sep 17 00:00:00 2001
From: Leo Neat <lneat@google.com>
Date: Thu, 12 Mar 2020 12:01:57 -0700
Subject: [PATCH] Affected fuzzer fix (#3494)

Fixing json decode error with affected fuzzer functionality.
---
 infra/cifuzz/cifuzz.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/infra/cifuzz/cifuzz.py b/infra/cifuzz/cifuzz.py
index bceb58c1e..d0919291b 100644
--- a/infra/cifuzz/cifuzz.py
+++ b/infra/cifuzz/cifuzz.py
@@ -353,8 +353,9 @@ def get_json_from_url(url):
     logging.error('HTTP error with url %s.', url)
     return None
   try:
-    result_json = json.load(response)
-  except ValueError as excp:
+    # read().decode() fixes compatability issue with urllib response object.
+    result_json = json.loads(response.read().decode())
+  except (ValueError, TypeError, json.JSONDecodeError) as excp:
     logging.error('Loading json from url %s failed with: %s.', url, str(excp))
     return None
   return result_json