From baeb22e09d40ab70bbed7ad5cbacbf8f7f6d96b4 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Tue, 9 Nov 2010 13:48:33 -0500
Subject: [PATCH] Don't leak errors from unserialize

---
 ansel/lib/Storage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansel/lib/Storage.php b/ansel/lib/Storage.php
index 2bca772ce..9d71991fc 100644
--- a/ansel/lib/Storage.php
+++ b/ansel/lib/Storage.php
@@ -297,7 +297,8 @@ class Ansel_Storage
        if (!count($overrides) && $GLOBALS['conf']['ansel_cache']['usecache'] &&
            ($gallery = $GLOBALS['injector']->getInstance('Horde_Cache')->get('Ansel_Gallery' . $gallery_id, $GLOBALS['conf']['cache']['default_lifetime'])) !== false) {
 
-           return unserialize($gallery);
+           $cached_gallery = @unserialize($gallery);
+           if ($cached_gallery) { return $cached_gallery; }
        }
 
        try {
-- 
2.11.0