Added extra protection to the encoding/decoding of JSON data

Author: jonasraoni

classes/db/DAO.php

@@ -333,7 +333,7 @@ public function convertFromDB($value, $type, $nullable = false)
                 $decodedValue = json_decode($value ?? ($type === 'array' ? '[]' : '{}'), true);
                 // FIXME: pkp/pkp-lib#6250 Remove after 3.3.x upgrade code is removed (see also pkp/pkp-lib#5772)
                 if (!is_null($decodedValue)) {
-                    return $decodedValue;
+                    return $type === 'array' ? array_values((array) $decodedValue) : (object) $decodedValue;
                 } else {
                     return unserialize($value);
                 }
@@ -399,6 +399,9 @@ public function convertToDB($value, &$type, $nullable = false)
         switch ($type) {
             case 'object':
             case 'array':
+                if ($value !== null) {
+                    $value = $type === 'array' ? array_values((array) $value) : (object) $value;
+                }
                 $value = json_encode($value, JSON_UNESCAPED_UNICODE);
                 break;
             case 'bool':