Skip to content

Commit

Permalink
Merge pull request #9472 from jacob-baines/mismatch
Browse files Browse the repository at this point in the history
Fix mismatching new/delete
  • Loading branch information
DDuarte committed Mar 20, 2013
2 parents 7a46950 + 88dd08d commit a44319a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/tools/mesh_extractor/DBC.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ std::string DBC::GetStringByOffset( int offset )
strcpy(d, (const char*)(StringBlock + offset)); strcpy(d, (const char*)(StringBlock + offset));
d[len] = '\0'; d[len] = '\0';
std::string val = std::string(d); std::string val = std::string(d);
delete d; delete [] d;
return val; return val;
} }


Expand Down
2 changes: 1 addition & 1 deletion src/tools/mesh_extractor/Utils.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ void Utils::SaveToDisk( FILE* stream, std::string path )
// Close the filestream // Close the filestream
fclose(disk); fclose(disk);
// Free the used memory // Free the used memory
delete data; delete [] data;
} }


Vector3 Utils::ToWoWCoords( Vector3 vec ) Vector3 Utils::ToWoWCoords( Vector3 vec )
Expand Down

0 comments on commit a44319a

Please sign in to comment.