Fix segfault with GetMapFileName()

fabiangreffrath · Jul 14, 2024 · 99c1e11 · fabiangreffrath · Jul 14, 2024 · erysdren
1 parent e1be995
commit 99c1e11
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/rott/rt_menu.c b/rott/rt_menu.c
@@ -7976,7 +7976,7 @@ void ShowBattleOptions
       }
    ShowBattleOption( inmenu, PosX, PosY, 0, 9, "Danger Damage", string );
 
-   GetMapFileName ( text );
+   GetMapFileName ( text, sizeof(text) );
    ShowBattleOption( inmenu, PosX, PosY, 0, 10, "Filename", text );
 
    itoa( numplayers, text, 10 );

diff --git a/rott/rt_net.c b/rott/rt_net.c
@@ -2420,7 +2420,7 @@ void SendGameDescription( void )
    desc->teamplay = gamestate.teamplay;
    memcpy( &desc->SpecialsTimes, &gamestate.SpecialsTimes, sizeof( specials ) );
    BATTLE_GetOptions( &( desc->options ) );
-   GetMapFileName( &(desc->battlefilename[0]) );
+   GetMapFileName( &(desc->battlefilename[0]), sizeof(desc->battlefilename) );
    desc->randomseed=GetRNGindex ( );
    gamestate.randomseed=desc->randomseed;
    desc->ludicrousgibs=battlegibs;

diff --git a/rott/rt_ted.c b/rott/rt_ted.c
@@ -1622,24 +1622,27 @@ void GetMapFileInfo
 =
 ======================
 */
-void GetMapFileName ( char * filename )
+void GetMapFileName ( char * filename, size_t n )
 {
-   if ( ( BATTLEMODE ) && (BattleLevels.avail == true) )
-      {
-      strcpy(filename,BattleLevels.file);
-      }
-   else if (GameLevels.avail == true)
-      {
-      strcpy(filename,GameLevels.file);
-      }
-   else if ( BATTLEMODE )
-      {
-      strcpy(filename,BATTMAPS);
-      }
-   else
-      {
-      strcpy(filename,ROTTMAPS);
-      }
+	char *src, *ptr;
+
+	if (BATTLEMODE && BattleLevels.avail == true)
+		src = BattleLevels.file;
+	else if (GameLevels.avail == true)
+		src = GameLevels.file;
+	else if ( BATTLEMODE )
+		src = BATTMAPS;
+	else
+		src = ROTTMAPS;
+
+	ptr = strrchr(src, PATH_SEP_CHAR);
+
+	if (ptr == NULL)
+		ptr = src;
 const char *M_BaseName(const char *path) 
 { 
     const char *pf, *pb; 
     pf = strrchr(path, '/'); 
 #ifdef _WIN32 
     pb = strrchr(path, '\\'); 
     // [FG] allow C:filename 
     if (pf == NULL && pb == NULL) 
     { 
         pb = strrchr(path, ':'); 
     } 
 #else 
     pb = NULL; 
 #endif 
     if (pf == NULL && pb == NULL) 
     { 
         return path; 
     } 
     else 
     { 
         const char *p = max(pb, pf); 
         return p + 1; 
     } 
 } 
 const char *M_BaseName(const char *path) 
 { 
     const char *pf, *pb; 
  
     pf = strrchr(path, '/'); 
 #ifdef _WIN32 
     pb = strrchr(path, '\\'); 
     // [FG] allow C:filename 
     if (pf == NULL && pb == NULL) 
     { 
         pb = strrchr(path, ':'); 
     } 
 #else 
     pb = NULL; 
 #endif 
     if (pf == NULL && pb == NULL) 
     { 
         return path; 
     } 
     else 
     { 
         const char *p = max(pb, pf); 
         return p + 1; 
     } 
 } 
+	else
+		ptr = ptr + 1;
+
+	strncpy(filename,ptr,n);
 }
 
 /*
@@ -1673,7 +1676,7 @@ unsigned short GetMapCRC
    RTLMAP RTLMap;
    size_t mapsoffset;
 
-   GetMapFileName( &filename[ 0 ] );
+   GetMapFileName( &filename[ 0 ], sizeof(filename) );
    CheckRTLVersion( filename );
    filehandle = SafeOpenRead( filename );
    mapsoffset = GetMapArrayOffset( filehandle );

diff --git a/rott/rt_ted.h b/rott/rt_ted.h
@@ -168,7 +168,7 @@ void PrintMapStats (void);
 void PrintTileStats (void);
 
 void GetMapInfo (mapfileinfo_t * mapinfo);
-void GetMapFileName ( char * filename );
+void GetMapFileName ( char * filename, size_t n );
 void SetBattleMapFileName ( char * filename );
 unsigned short GetMapCRC ( int num );