From 03f5a889d63d880f109d6c077b51b43cbab8ff78 Mon Sep 17 00:00:00 2001 From: Si Jie Date: Tue, 5 Feb 2019 11:57:40 +0700 Subject: [PATCH] ExportJson: add checks to prevent crash when encode returns boolean instead of string Signed-off-by: Si Jie --- libraries/classes/Plugins/Export/ExportJson.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php index 326a371b84..964dc65aa9 100644 --- a/libraries/classes/Plugins/Export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -268,7 +268,11 @@ class ExportJson extends ExportPlugin $data[$columns[$i]] = $record[$i]; } - if (!Export::outputHandler($this->encode($data))) { + $encoded_data = $this->encode($data); + if (!$encoded_data) { + return false; + } + if (!Export::outputHandler($encoded_data)) { return false; } }