If a file was unable to be accessed, pressing ENTER on it would cause…

… a NULL-pointer dereference (Problem introduced in v0.2.102, adding support for libancient)
mywave82 · Sep 14, 2024 · 54b201a · 54b201a
1 parent ccd8169
commit 54b201a
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/filesel/pfilesel.c b/filesel/pfilesel.c
@@ -827,12 +827,15 @@ int fsGetPrevFile (struct moduleinfostruct *info, struct ocpfilehandle_t **fileh
 	{
 		if (m->file)
 		{
-			struct ocpfilehandle_t *ancient;
 			*filehandle = m->file->open (m->file);
-			if ((ancient = ancient_filehandle (0, 0, *filehandle)))
+			if (*filehandle)
 			{
-				(*filehandle)->unref (*filehandle);
-				*filehandle = ancient;
+				struct ocpfilehandle_t *ancient;
+				if ((ancient = ancient_filehandle (0, 0, *filehandle)))
+				{
+					(*filehandle)->unref (*filehandle);
+					*filehandle = ancient;
+				}
 			}
 		}
 
@@ -905,12 +908,15 @@ int fsGetNextFile (struct moduleinfostruct *info, struct ocpfilehandle_t **fileh
 
 	if (m->file)
 	{
-		struct ocpfilehandle_t *ancient;
 		*filehandle = m->file->open (m->file);
-		if ((ancient = ancient_filehandle (0, 0, *filehandle)))
+		if (*filehandle)
 		{
-			(*filehandle)->unref (*filehandle);
-			*filehandle = ancient;
+			struct ocpfilehandle_t *ancient;
+			if ((ancient = ancient_filehandle (0, 0, *filehandle)))
+			{
+				(*filehandle)->unref (*filehandle);
+				*filehandle = ancient;
+			}
 		}
 	}