webMAN MOD 1.47.45

- Fixed instant freeze using combos SELECT+L1 / SELECT+R1 used for mount last games (issue #891) The bug was because the mount function was using _path0 as a pointer instead of a stack variable.
aldostools · Jul 23, 2023 · 21f46fd · 21f46fd
1 parent 438a6f5
commit 21f46fd
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 3 deletions.
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx
diff --git a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server.sprx
diff --git a/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx b/_Projects_/updater/update/dev_hdd0/plugins/webftp_server_noncobra.sprx
diff --git a/include/mount/mount.h b/include/mount/mount.h
@@ -1459,7 +1459,7 @@ static void mount_autoboot(void)
 /***********************************************/
 /* mount_thread parameters                     */
 /***********************************************/
-static char *_path0;
+static char _path0[MAX_PATH_LEN];
 static bool mount_ret = false;
 /***********************************************/
 
@@ -1839,7 +1839,7 @@ static bool mount_game(const char *path, u8 action)
 */
 	if(is_mounting) return false; is_mounting = true;
 
-	_path0 = (char*)path;
+	strcpy(_path0, path);
 
 	sys_ppu_thread_t t_id;
 	sys_ppu_thread_create(&t_id, mount_thread, (u64)action, THREAD_PRIO_HIGH, THREAD_STACK_SIZE_MOUNT_GAME, SYS_PPU_THREAD_CREATE_JOINABLE, THREAD_NAME_CMD);
@@ -1849,7 +1849,7 @@ static bool mount_game(const char *path, u8 action)
 
 	close_ftp_sessions_idle();
 
-	_path0 = NULL;
+	_memset(_path0, sizeof(_path0));
 
 	return mount_ret;
 }
diff --git a/include/mount/patch_ps2demo.h b/include/mount/patch_ps2demo.h
@@ -1,6 +1,9 @@
 #ifdef COBRA_ONLY
 static void patch_ps2_demo(const char *iso_file)
 {
+	// skip patch if using ps2_emu: 0x01 = CECH-A*, 0x02 = CECH-B
+	if((eid0_idps[0] & 0x00000000000000FF) <= 0x02 && !(webman_config->ps2emu)) return;
+
 	u32 offset, root;
 	char data[0x40];
 	char game_id[12];    _memset(game_id,  sizeof(game_id));