From de00eb95e74ffba0f6341a77848ac2ff8d79369f Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sun, 8 Nov 2009 22:06:33 +0000 Subject: [PATCH] Correction to my last revision. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2168 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/Elfheader.cpp | 5 +---- pcsx2/Linux/pcsx2.cbp | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) 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 @@ +