[Scummvm-git-logs] scummvm master -> 56019fa074a5728e17a1614642f82e65e34d56ca

[lephilousophe]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
56019fa074 COMMON: ARCHIVE: Fix crash in SearchSet::addDirectory on PSP2


Commit: 56019fa074a5728e17a1614642f82e65e34d56ca
    https://github.com/scummvm/scummvm/commit/56019fa074a5728e17a1614642f82e65e34d56ca
Author: William Bonnaventure (william.bonnaventure at gmail.com)
Date: 2025-11-02T09:14:28+01:00

Commit Message:
COMMON: ARCHIVE: Fix crash in SearchSet::addDirectory on PSP2

Following commit : 95440c2
"ZVISION: Rework engine to use standard SearchMan functionality."
an error is now raised in SearchSet::addDirectory() while it was
ignored before.
The culprit is a call inside SearchManager::clear() which tries to
add the directory "." that is not really a valid directory on PSP2.
Just prevent calling addDirectory() with "." like we do on Android.
Also tested on Linux but it works fine. Maybe some other platforms
are affected ?

Changed paths:
    common/archive.cpp


diff --git a/common/archive.cpp b/common/archive.cpp
index 1289436fb83..9dd781c42ab 100644
--- a/common/archive.cpp
+++ b/common/archive.cpp
@@ -633,7 +633,7 @@ void SearchManager::clear() {
 	if (g_system)
 		g_system->addSysArchivesToSearchSet(*this, -1);
 
-#ifndef __ANDROID__
+#if !defined(__ANDROID__) && !defined(PSP2)
 	// Add the current dir as a very last resort.
 	// See also bug #3984.
 	// But don't do this for Android platform, since it may lead to crashes