Merge "Blob can't be false"

diff --combined includes/Revision.php
index 89a58f3,495e484..dc15f97
--- 1/includes/Revision.php
--- 2/includes/Revision.php
+++ b/includes/Revision.php
@@@ -1038,18 -1038,7 +1038,18 @@@ class Revision implements IDBAccessObje
                        ? SqlBlobStore::makeAddressFromTextId( $row->old_id )
                        : null;
  
 -              return self::getBlobStore( $wiki )->expandBlob( $text, $flags, $cacheKey );
 +              $revisionText = self::getBlobStore( $wiki )->expandBlob( $text, $flags, $cacheKey );
 +
 +              if ( $revisionText === false ) {
 +                      if ( isset( $row->old_id ) ) {
 +                              wfLogWarning( __METHOD__ . ": Bad data in text row {$row->old_id}! " );
 +                      } else {
 +                              wfLogWarning( __METHOD__ . ": Bad data in text row! " );
 +                      }
 +                      return false;
 +              }
 +
 +              return $revisionText;
        }
  
        /**
@@@ -1074,6 -1063,11 +1074,11 @@@
         * @return string|bool Decompressed text, or false on failure
         */
        public static function decompressRevisionText( $text, $flags ) {
+               if ( $text === false ) {
+                       // Text failed to be fetched; nothing to do
+                       return false;
+               }
+ 
                return self::getBlobStore()->decompressData( $text, $flags );
        }
  

diff --combined includes/Storage/SqlBlobStore.php
index f097f67,79dce49..fb3ef94
--- 1/includes/Storage/SqlBlobStore.php
--- 2/includes/Storage/SqlBlobStore.php
+++ b/includes/Storage/SqlBlobStore.php
@@@ -349,7 -349,7 +349,7 @@@ class SqlBlobStore implements IDBAccess
                $blob = $this->expandBlob( $row->old_text, $row->old_flags, $blobAddress );
  
                if ( $blob === false ) {
 -                      wfWarn( __METHOD__ . ": Bad data in text row $textId." );
 +                      wfLogWarning( __METHOD__ . ": Bad data in text row $textId." );
                        return false;
                }
  
@@@ -399,13 -399,13 +399,13 @@@
                                                // No negative caching per BlobStore::getBlob()
                                                $blob = ExternalStore::fetchFromURL( $url, [ 'wiki' => $this->wikiId ] );
  
-                                               return $this->decompressData( $blob, $flags );
+                                               return $blob === false ? false : $this->decompressData( $blob, $flags );
                                        },
                                        [ 'pcGroup' => self::TEXT_CACHE_GROUP, 'pcTTL' => WANObjectCache::TTL_PROC_LONG ]
                                );
                        } else {
                                $blob = ExternalStore::fetchFromURL( $url, [ 'wiki' => $this->wikiId ] );
-                               return $this->decompressData( $blob, $flags );
+                               return $blob === false ? false : $this->decompressData( $blob, $flags );
                        }
                } else {
                        return $this->decompressData( $raw, $flags );
@@@ -461,7 -461,7 +461,7 @@@
         * @note direct use is deprecated, use getBlob() or SlotRecord::getContent() instead.
         * @todo make this private, there should be no need to use this method outside this class.
         *
-        * @param mixed $blob Reference to a text
+        * @param string $blob Blob in compressed/encoded form.
         * @param array $blobFlags Compression flags, such as 'gzip'.
         *   Note that not including 'utf-8' in $blobFlags will cause the data to be decoded
         *   according to the legacy encoding specified via setLegacyEncoding.
@@@ -469,10 -469,8 +469,8 @@@
         * @return string|bool Decompressed text, or false on failure
         */
        public function decompressData( $blob, array $blobFlags ) {
-               if ( $blob === false ) {
-                       // Text failed to be fetched; nothing to do
-                       return false;
-               }
+               // Revision::decompressRevisionText accepted false here, so defend against that
+               Assert::parameterType( 'string', $blob, '$blob' );
  
                if ( in_array( 'error', $blobFlags ) ) {
                        // Error row, return false
@@@ -486,7 -484,7 +484,7 @@@
                        $blob = gzinflate( $blob );
  
                        if ( $blob === false ) {
 -                              wfLogWarning( __METHOD__ . ': gzinflate() failed' );
 +                              wfWarn( __METHOD__ . ': gzinflate() failed' );
                                return false;
                        }
                }