Tribes2/T2-CPP
1
0
Fork 0
mirror of https://github.com/Ragora/T2-CPP.git synced 2026-07-16 10:24:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more compiler warnings regarding returning stack-based variables; Fixed more compiler warnings about the safety of methods such as sprintf

Browse source
This commit is contained in:
Robert MacGregor 2016-05-01 02:57:45 -04:00
parent e6ecfb8a91
commit 15b64e0849
1 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

104
Mod Sources/TSExtension/TSExtension/source/DXConCmds.cpp
View file

@ -8,63 +8,77 @@
const char *conDumpHex(Linker::SimObject *obj, S32 argc, const char *argv[]) const char *conDumpHex(Linker::SimObject *obj, S32 argc, const char *argv[])
{ {
// Hmm... // Hmm...
char result[256];
unsigned int addr=atoi(argv[1]);
DX::memToHex(addr,result,atoi(argv[2]),dAtob(argv[3]));
return result;
}
const char *conDumpUInt(Linker::SimObject *obj, S32 argc, const char *argv[])
{
// Hmm...
char result[256];
unsigned int addr=atoi(argv[1]);
sprintf(result,"%d",DX::memToUInt(addr));
return result;
}
const char *conDumpFloat(Linker::SimObject *obj, S32 argc, const char *argv[])
{
// Hmm...
char result[256];
unsigned int addr=atoi(argv[1]);
sprintf(result,"%f",DX::memToFloat(addr));
return result;
}
const char *conFloatToHex(Linker::SimObject *obj, S32 argc, const char *argv[])
{
char formatResult[256]; char formatResult[256];
float input=atof(argv[1]);
float * inputptr=&input; unsigned int addr=atoi(argv[1]);
void * inputptr2 = (void *)inputptr; DX::memToHex(addr,formatResult,atoi(argv[2]),dAtob(argv[3]));
unsigned int * inputptr3=(unsigned int*)inputptr2;
sprintf (formatResult,"%08X",*inputptr3);
char* result = new char[256]; char* result = new char[256];
memcpy(result, formatResult, 256); memcpy(result, formatResult, 256);
return result; return result;
} }
const char *conDumpUInt(Linker::SimObject *obj, S32 argc, const char *argv[])
{
// Hmm...
char formatResult[256];
unsigned int addr=atoi(argv[1]);
sprintf_s<256>(formatResult,"%d",DX::memToUInt(addr));
char* result = new char[256];
memcpy(result, formatResult, 256);
return result;
}
const char *conDumpFloat(Linker::SimObject *obj, S32 argc, const char *argv[])
{
// Hmm...
char formatResult[256];
unsigned int addr = atoi(argv[1]);
sprintf_s<256>(formatResult,"%f",DX::memToFloat(addr));
char* result = new char[256];
memcpy(result, formatResult, 256);
return result;
}
const char *conFloatToHex(Linker::SimObject *obj, S32 argc, const char *argv[])
{
char formatResult[256];
float input=std::stof(argv[1]);
float * inputptr=&input;
void * inputptr2 = (void *)inputptr;
unsigned int * inputptr3=(unsigned int*)inputptr2;
sprintf_s<256>(formatResult,"%08X",*inputptr3);
char* result = new char[256];
memcpy(result, formatResult, 256);
return result;
}
const char *conGetAddress(Linker::SimObject *obj, S32 argc, const char *argv[]) const char *conGetAddress(Linker::SimObject *obj, S32 argc, const char *argv[])
{ {
// Hmm... // Hmm...
char formatResult[256]; char formatResult[256];
sprintf(formatResult, "%x", obj); sprintf_s<256>(formatResult, "%x", obj);
char* result = new char[256]; char* result = new char[256];
memcpy(result, formatResult, 256); memcpy(result, formatResult, 256);
return result; return result;
} }
const char *conGetAddressDec(Linker::SimObject *obj, S32 argc, const char *argv[]) const char *conGetAddressDec(Linker::SimObject *obj, S32 argc, const char *argv[])
{ {
// Hmm... // Hmm...
char formatResult[256]; char formatResult[256];
sprintf(formatResult, "%d", obj); sprintf_s<256>(formatResult, "%d", obj);
char* result = new char[256]; char* result = new char[256];
memcpy(result, formatResult, 256); memcpy(result, formatResult, 256);
@ -156,13 +170,13 @@ S32 conGetGhostIndex(Linker::SimObject *obj, S32 argc, const char* argv[])
DX::NetConnection conn = DX::NetConnection((unsigned int)obj); DX::NetConnection conn = DX::NetConnection((unsigned int)obj);
char aicommand[255]=""; char aicommand[256]="";
sprintf (aicommand,"return (%d.isAIControlled());", conn.identifier); sprintf_s<256>(aicommand,"return (%d.isAIControlled());", conn.identifier);
if (dAtob(Con::evaluate(aicommand, false, NULL, false)) == true) if (dAtob(Con::evaluate(aicommand, false, NULL, false)) == true)
return -1; return -1;
char command[255]=""; char command[256]="";
sprintf (command,"return (%d.getAddress());",conn.identifier); sprintf_s<256>(command,"return (%d.getAddress());",conn.identifier);
if (strcmp(Con::evaluate(command, false, NULL, false), "local") == 0) if (strcmp(Con::evaluate(command, false, NULL, false), "local") == 0)
return atoi(argv[2]); return atoi(argv[2]);
@ -354,7 +368,7 @@ const char* conSprintf(Linker::SimObject *obj, S32 argc, const char* argv[])
char formatResult[256]; char formatResult[256];
va_list variable_args = reinterpret_cast<va_list>(input.data()); va_list variable_args = reinterpret_cast<va_list>(input.data());
vsprintf(formatResult, argv[1], variable_args); vsprintf_s<256>(formatResult, argv[1], variable_args);
char* result = new char[256]; char* result = new char[256];
memcpy(result, formatResult, 256); memcpy(result, formatResult, 256);
@ -410,10 +424,14 @@ const char* reReplace(Linker::SimObject* obj, S32 argc, const char* argv[])
{ {
try try
{ {
std::string result = std::regex_replace(std::string(argv[2]), std::string replaceResult = std::regex_replace(std::string(argv[2]),
std::regex(argv[1], std::regex::extended), std::regex(argv[1], std::regex::extended),
std::string(argv[3])); std::string(argv[3]));
return result.c_str();
char* result = new char[256];
memcpy(result, replaceResult.c_str(), replaceResult.size());
return result;
} }
catch (std::regex_error) catch (std::regex_error)
{ {