Merge "filebackend: Avoid passing null to FileBackend::normalizeContainerPath" into REL1_43

This commit is contained in:
jenkins-bot 2025-04-11 17:14:00 +00:00 committed by Gerrit Code Review
commit 0422213b8a

View file

@ -1623,7 +1623,7 @@ abstract class FileBackendStore extends FileBackend {
*/
final protected function resolveStoragePath( $storagePath ) {
[ $backend, $shortCont, $relPath ] = self::splitStoragePath( $storagePath );
if ( $backend === $this->name ) { // must be for this backend
if ( $backend === $this->name && $relPath !== null ) { // must be for this backend
$relPath = self::normalizeContainerPath( $relPath );
if ( $relPath !== null && self::isValidShortContainerName( $shortCont ) ) {
// Get shard for the normalized path if this container is sharded