Skip to content

fix(ww3d2): Copy string setter inputs before freeing potentially aliased storage #3313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 1 commit into from
Sep 20, 2026
Merged

fix(ww3d2): Copy string setter inputs before freeing potentially aliased storage #3313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ class AggregateDefClass
virtual WW3DErrorType Load_W3D (ChunkLoadClass &chunk_load);
virtual WW3DErrorType Save_W3D (ChunkSaveClass &chunk_save);
const char * Get_Name () const { return m_pName; }
void Set_Name (const char *pname) { SAFE_FREE (m_pName); m_pName = ::_strdup (pname); }
void Set_Name (const char* pname)
{
char* name = ::_strdup(pname);
SAFE_FREE(m_pName);
m_pName = name;
}
RenderObjClass * Create ();
AggregateDefClass * Clone () const { return W3DNEW AggregateDefClass (*this); }

Expand Down
13 changes: 4 additions & 9 deletions Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,11 @@ ParameterClass::Get_Name () const
// Set_Name
//////////////////////////////////////////////////////////////////////////////////
inline void
ParameterClass::Set_Name (const char *new_name)
ParameterClass::Set_Name (const char* new_name)
{
if (m_Name != nullptr) {
::free ((void *)m_Name);
m_Name = nullptr;
}

if (new_name != nullptr) {
m_Name = ::strdup (new_name);
}
char* name = new_name ? ::strdup(new_name) : nullptr;
::free((void*)m_Name);
m_Name = name;
}


Expand Down
13 changes: 4 additions & 9 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,16 +818,11 @@ ParticleEmitterClass::Save (ChunkSaveClass &chunk_save) const


void
ParticleEmitterClass::Set_Name (const char *pname)
ParticleEmitterClass::Set_Name (const char* pname)
{
// Free the old name if necessary
if (NameString != nullptr) {
::free (NameString);
NameString = nullptr;
}

// Copy the provided name
NameString = ::_strdup (pname);
char* name = ::_strdup(pname);
::free(NameString);
NameString = name;
}


Expand Down
10 changes: 6 additions & 4 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,9 @@ ParticleEmitterDefClass::Set_Creation_Volume (Vector3Randomizer *randomizer)
void
ParticleEmitterDefClass::Set_User_String (const char *pstring)
{
SAFE_FREE (m_pUserString);
m_pUserString = ::_strdup (pstring);
char* copy = ::_strdup(pstring);
SAFE_FREE(m_pUserString);
m_pUserString = copy;
}


Expand All @@ -276,8 +277,9 @@ ParticleEmitterDefClass::Set_User_String (const char *pstring)
void
ParticleEmitterDefClass::Set_Name (const char *pname)
{
SAFE_FREE (m_pName);
m_pName = ::_strdup (pname);
char* copy = ::_strdup(pname);
SAFE_FREE(m_pName);
m_pName = copy;
}


Expand Down
13 changes: 4 additions & 9 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,16 +831,11 @@ ParticleEmitterClass::Save (ChunkSaveClass &chunk_save) const


void
ParticleEmitterClass::Set_Name (const char *pname)
ParticleEmitterClass::Set_Name (const char* pname)
{
// Free the old name if necessary
if (NameString != nullptr) {
::free (NameString);
NameString = nullptr;
}

// Copy the provided name
NameString = ::_strdup (pname);
char* name = ::_strdup(pname);
::free(NameString);
NameString = name;
}


Expand Down
10 changes: 6 additions & 4 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,9 @@ ParticleEmitterDefClass::Set_Creation_Volume (Vector3Randomizer *randomizer)
void
ParticleEmitterDefClass::Set_User_String (const char *pstring)
{
SAFE_FREE (m_pUserString);
m_pUserString = ::_strdup (pstring);
char* copy = ::_strdup(pstring);
SAFE_FREE(m_pUserString);
m_pUserString = copy;
}


Expand All @@ -279,8 +280,9 @@ ParticleEmitterDefClass::Set_User_String (const char *pstring)
void
ParticleEmitterDefClass::Set_Name (const char *pname)
{
SAFE_FREE (m_pName);
m_pName = ::_strdup (pname);
char* copy = ::_strdup(pname);
SAFE_FREE(m_pName);
m_pName = copy;
}


Expand Down
Loading