From 9e91d1d435af8d6291eb393dea9d377657e24dad Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 21 Nov 2022 01:43:17 -0800 Subject: [PATCH] write: check encoded json (fix #220) --- lib/Db/TimelineWrite.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Db/TimelineWrite.php b/lib/Db/TimelineWrite.php index a1eceba7b..415c45177 100644 --- a/lib/Db/TimelineWrite.php +++ b/lib/Db/TimelineWrite.php @@ -114,8 +114,12 @@ public function processFile( $exifJson = json_encode($exif); // Store error if data > 64kb - if (\strlen($exifJson) > 65535) { - $exifJson = json_encode(['error' => 'Exif data too large']); + if (\is_string($exifJson)) { + if (\strlen($exifJson) > 65535) { + $exifJson = json_encode(['error' => 'Exif data too large']); + } + } else { + $exifJson = json_encode(['error' => 'Exif data encoding error']); } if ($prevRow) {