From: notaz <notasas@gmail.com>
Date: Tue, 4 Jun 2013 21:58:22 +0000 (+0300)
Subject: psxmem: handle map failures so that it can be retried
X-Git-Tag: r20~61
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88901dd2de7982c765053ec47ef987efbc8ab89e;p=pcsx_rearmed.git

psxmem: handle map failures so that it can be retried
---

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 4da0cf4c..2ca5dd58 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -95,7 +95,8 @@ void psxUnmap(void *ptr, size_t size, enum psxMapTag tag)
 		return;
 	}
 
-	munmap(ptr, size);
+	if (ptr)
+		munmap(ptr, size);
 }
 
 s8 *psxM = NULL; // Kernel & User Memory (2 Meg)
@@ -155,6 +156,7 @@ int psxMemInit() {
 	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
 		psxR == NULL || psxP == NULL || psxH != (void *)0x1f800000) {
 		SysMessage(_("Error allocating memory!"));
+		psxMemShutdown();
 		return -1;
 	}
 
@@ -208,12 +210,12 @@ void psxMemReset() {
 }
 
 void psxMemShutdown() {
-	psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
-	psxUnmap(psxH, 0x10000, MAP_TAG_OTHER);
-	psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
+	psxUnmap(psxM, 0x00210000, MAP_TAG_RAM); psxM = NULL;
+	psxUnmap(psxH, 0x10000, MAP_TAG_OTHER); psxH = NULL;
+	psxUnmap(psxR, 0x80000, MAP_TAG_OTHER); psxR = NULL;
 
-	free(psxMemRLUT);
-	free(psxMemWLUT);
+	free(psxMemRLUT); psxMemRLUT = NULL;
+	free(psxMemWLUT); psxMemWLUT = NULL;
 }
 
 static int writeok = 1;