X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fcommon%2Fmenu.c;h=aa76e4314bb5545b666c6dd6dbaa0731633b2b76;hp=22a66ead0a6f14dbbabb0244a195383c634bef27;hb=1bd9ee68b03333894512373d14707d04951665af;hpb=5088bb7009b7517276478226dd9df66229f871bc

diff --git a/frontend/common/menu.c b/frontend/common/menu.c
index 22a66ead..aa76e431 100644
--- a/frontend/common/menu.c
+++ b/frontend/common/menu.c
@@ -872,9 +872,12 @@ rescan:
 			{
 				int newlen;
 				char *p, *newdir;
-				if (!(inp & PBTN_MOK)) continue;
+				if (!(inp & PBTN_MOK))
+					continue;
 				newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;
 				newdir = malloc(newlen);
+				if (newdir == NULL)
+					break;
 				if (strcmp(namelist[sel+1]->d_name, "..") == 0) {
 					char *start = curr_path;
 					p = start + strlen(start) - 1;
@@ -920,6 +923,13 @@ rescan:
 		free(namelist);
 	}
 
+	// restore curr_path
+	if (fname != NULL) {
+		n = strlen(curr_path);
+		if (curr_path + n + 1 == fname)
+			curr_path[n] = '/';
+	}
+
 	return ret;
 }