diff --git a/pcsx2/Elfheader.cpp b/pcsx2/Elfheader.cpp index f97ebb9370..00f56d69f9 100644 --- a/pcsx2/Elfheader.cpp +++ b/pcsx2/Elfheader.cpp @@ -587,13 +587,10 @@ void loadElfFile(const wxString& filename) { if( memcmp( "rom0:OSDSYS", (char*)PSM( i ), 11 ) == 0 ) { - char* temp; strcpy( (char*)PSM( i ), fnptr ); - strcpy(temp, fnptr); // Passing wxCharBuffers to WriteLn crashes pcsx2. - DevCon.WriteLn( "loadElfFile: addr %x \"%s\" -> \"%s\"", i, "rom0:OSDSYS", temp ); + DevCon.WriteLn( "loadElfFile: addr %x \"%s\" -> \"%s\"", i, "rom0:OSDSYS", fnptr.data() ); } } - ElfCRC = elfobj.GetCRC(); Console.WriteLn( L"loadElfFile: %s; CRC = %8.8X", filename.c_str(), ElfCRC ); ElfApplyPatches(); diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index 0e547f486b..7f4912aa27 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -122,6 +122,7 @@ +