Check for invalid serialized objects and return an error condition instead of just...

diff --git a/includes/Revision.php b/includes/Revision.php
index c289bf7..e9083a7 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -530,6 +530,11 @@ class Revision {
                        if( in_array( 'object', $flags ) ) {
                                # Generic compressed storage
                                $obj = unserialize( $text );
+                               if ( !is_object( $obj ) ) {
+                                       // Invalid object
+                                       wfProfileOut( $fname );
+                                       return false;
+                               }
                                $text = $obj->getText();
                        }