OM PR 4394

OpenMage/magento-lts#4394
justinbeaty · Feb 3, 2025 · b8f2a57 · b8f2a57
1 parent 422f483
commit b8f2a57
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/code/core/Mage/Core/Helper/UnserializeArray.php b/app/code/core/Mage/Core/Helper/UnserializeArray.php
@@ -22,11 +22,13 @@ class Mage_Core_Helper_UnserializeArray
      * @param string $str
      * @return array
      * @throws Exception
+     * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
     public function unserialize($str)
     {
         try {
-            $result = unserialize($str, ['allowed_classes' => false]);
+            $str = is_null($str) ? '' : $str;
+            $result = @unserialize($str, ['allowed_classes' => false]);
             if ($result === false && $str !== serialize(false)) {
                 throw new Exception('Error unserializing data.');
             }