x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG: fixed all kinds of small coding bugs (thanks to Coverity)

This commit is contained in:
Mr. eXoDia 2014-08-31 23:21:31 +02:00
parent 8e795bf6db
commit 5a214ab104
14 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x64_dbg_dbg/_exports.cpp
View File

@ -108,7 +108,7 @@ extern "C" DLL_EXPORT bool _dbg_addrinfoget(duint addr, SEGMENTREG segment, ADDR
if(SymFromAddr(fdProcessInfo->hProcess, (DWORD64)addr, &displacement, pSymbol) and !displacement)
{
if(settingboolget("Engine", "UndecorateSymbolNames") or !UnDecorateSymbolName(pSymbol->Name, addrinfo->label, MAX_LABEL_SIZE, UNDNAME_COMPLETE))
strcpy(addrinfo->label, pSymbol->Name);
strcpy_s(addrinfo->label, pSymbol->Name);
retval = true;
}
if(!retval) //search for CALL <jmp.&user32.MessageBoxA>

4
x64_dbg_dbg/_global.cpp
View File

@ -78,7 +78,7 @@ int memleaks()
void setalloctrace(const char* file)
{
strcpy(alloctrace, file);
strcpy_s(alloctrace, file);
}
bool arraycontains(const char* cmd_list, const char* cmd)
@ -87,7 +87,7 @@ bool arraycontains(const char* cmd_list, const char* cmd)
if(!cmd_list or !cmd)
return false;
char temp[deflen] = "";
strcpy(temp, cmd_list);
strcpy_s(temp, cmd_list);
int len = (int)strlen(cmd_list);
if(len >= deflen)
return false;

4
x64_dbg_dbg/addrinfo.cpp
View File

@ -482,7 +482,7 @@ void commentcacheload(JSON root)
curComment.manual = false;
const char* text = json_string_value(json_object_get(value, "text"));
if(text)
strcpy(curComment.text, text);
strcpy_s(curComment.text, text);
else
continue; //skip
const uint key = modhashfromname(curComment.mod) + curComment.addr;
@ -664,7 +664,7 @@ void labelcacheload(JSON root)
curLabel.manual = false;
const char* text = json_string_value(json_object_get(value, "text"));
if(text)
strcpy(curLabel.text, text);
strcpy_s(curLabel.text, text);
else
continue; //skip
const uint key = modhashfromname(curLabel.mod) + curLabel.addr;

8
x64_dbg_dbg/argument.cpp
View File

@ -44,7 +44,7 @@ void argformat(char* cmd)
start = len;
char arguments_[deflen] = "";
char* arguments = arguments_;
strcpy(arguments, command + start);
strcpy_s(arguments, deflen, command + start);
char temp[deflen] = "";
len = (int)strlen(arguments);
for(int i = 0, j = 0; i < len; i++)
@ -53,7 +53,7 @@ void argformat(char* cmd)
i += 2;
j += sprintf(temp + j, "%c", arguments[i]);
}
strcpy(arguments, temp);
strcpy_s(arguments, deflen, temp);
len = (int)strlen(arguments);
for(int i = 0; i < len; i++)
if(arguments[i] == '\\' and arguments[i + 1] == '\\')
@ -79,7 +79,7 @@ void argformat(char* cmd)
arguments[i] = 0;
for(int i = 0; i < len; i++)
if(arguments[i] == 1 and arguments[i + 1] == 1)
if(arguments[i] == 1 and (i < len - 1 and arguments[i + 1] == 1))
{
arguments[i] = '\\';
arguments[i + 1] = '\\';
@ -164,7 +164,7 @@ int arggetcount(const char* cmd)
char* temp = temp_ + 1;
strcpy(temp, cmd);
for(int i = start; i < len; i++)
if(temp[i] == '\\' and temp[i + 1] == '\\')
if(temp[i] == '\\' and (i < len - 1 and temp[i + 1] == '\\'))
{
temp[i] = 1;
temp[i + 1] = 1;

10
x64_dbg_dbg/breakpoint.cpp
View File

@ -36,7 +36,7 @@ bool bpnew(uint addr, bool enabled, bool singleshoot, short oldbytes, BP_TYPE ty
bp.addr = addr - modbase;
bp.enabled = enabled;
if(name and * name)
strcpy(bp.name, name);
strcpy_s(bp.name, name);
else
*bp.name = '\0';
bp.oldbytes = oldbytes;
@ -110,7 +110,7 @@ bool bpsetname(uint addr, BP_TYPE type, const char* name)
BreakpointsInfo::iterator found = breakpoints.find(BreakpointKey(type, modhashfromva(addr)));
if(found == breakpoints.end()) //not found
return false;
strcpy(breakpoints[found->first].name, name);
strcpy_s(breakpoints[found->first].name, name);
return true;
}
@ -193,8 +193,10 @@ void bptobridge(const BREAKPOINT* bp, BRIDGEBP* bridge)
break;
case BPMEMORY:
bridge->type = bp_memory;
break; //so that's why it didn't show in the gui.
default:
bridge->type = bp_none;
break;
}
}
@ -242,10 +244,10 @@ void bpcacheload(JSON root)
curBreakpoint.titantype = (DWORD)json_hex_value(json_object_get(value, "titantype"));
const char* name = json_string_value(json_object_get(value, "name"));
if(name)
strcpy(curBreakpoint.name, name);
strcpy_s(curBreakpoint.name, name);
const char* mod = json_string_value(json_object_get(value, "module"));
if(mod && *mod && strlen(mod) < MAX_MODULE_SIZE)
strcpy(curBreakpoint.mod, mod);
strcpy_s(curBreakpoint.mod, mod);
const uint key = modhashfromname(curBreakpoint.mod) + curBreakpoint.addr;
breakpoints.insert(std::make_pair(BreakpointKey(curBreakpoint.type, key), curBreakpoint));
}

2
x64_dbg_dbg/command.cpp
View File

@ -75,7 +75,7 @@ bool cmdnew(COMMAND* command_list, const char* name, CBCOMMAND cbCommand, bool d
COMMAND* cmdget(COMMAND* command_list, const char* cmd)
{
char new_cmd[deflen] = "";
strcpy(new_cmd, cmd);
strcpy_s(new_cmd, cmd);
int len = (int)strlen(new_cmd);
int start = 0;
while(new_cmd[start] != ' ' and start < len)

16
x64_dbg_dbg/debugger.cpp
View File

@ -661,11 +661,11 @@ static void cbCreateProcess(CREATE_PROCESS_DEBUG_INFO* CreateProcessInfo)
len--;
if(len)
len++;
strcpy(sqlitedb, szFileName + len);
strcpy_s(sqlitedb, szFileName + len);
#ifdef _WIN64
strcat(sqlitedb, ".dd64");
strcat_s(sqlitedb, ".dd64");
#else
strcat(sqlitedb, ".dd32");
strcat_s(sqlitedb, ".dd32");
#endif // _WIN64
sprintf(dbpath, "%s\\%s", dbbasepath, sqlitedb);
dprintf("Database file: %s\n", dbpath);
@ -1171,7 +1171,7 @@ DWORD WINAPI threadDebugLoop(void* lpParameter)
INIT_STRUCT* init = (INIT_STRUCT*)lpParameter;
bFileIsDll = IsFileDLL(init->exe, 0);
pDebuggedEntry = GetPE32Data(init->exe, 0, UE_OEP);
strcpy(szFileName, init->exe);
strcpy_s(szFileName, init->exe);
if(bFileIsDll)
fdProcessInfo = (PROCESS_INFORMATION*)InitDLLDebug(init->exe, false, init->commandline, init->currentfolder, 0);
else
@ -1429,12 +1429,12 @@ DWORD WINAPI threadAttachLoop(void* lpParameter)
//inform GUI start we started without problems
GuiSetDebugState(initialized);
//set GUI title
strcpy(szBaseFileName, szFileName);
strcpy_s(szBaseFileName, szFileName);
int len = (int)strlen(szBaseFileName);
while(szBaseFileName[len] != '\\' and len)
len--;
if(len)
strcpy(szBaseFileName, szBaseFileName + len + 1);
strcpy_s(szBaseFileName, szBaseFileName + len + 1);
GuiUpdateWindowTitle(szBaseFileName);
//call plugin callback (init)
PLUG_CB_INITDEBUG initInfo;
@ -1706,7 +1706,7 @@ bool dbggetjitauto(bool* auto_on, arch arch_in, arch* arch_out, readwritejitkey_
if(_readwritejitkey(jit_entry, & jit_entry_size, "Auto", arch_in, arch_out, & rw_error, false) == false)
{
if(rw_error = ERROR_RW_FILE_NOT_FOUND)
if(rw_error == ERROR_RW_FILE_NOT_FOUND)
{
if(rw_error_out != NULL)
* rw_error_out = rw_error;
@ -1738,7 +1738,7 @@ bool dbgsetjitauto(bool auto_on, arch arch_in, arch* arch_out, readwritejitkey_e
if(_readwritejitkey(jit_entry, & jit_entry_size, "Auto", arch_in, arch_out, & rw_error, false) == false)
{
if(rw_error = ERROR_RW_FILE_NOT_FOUND)
if(rw_error == ERROR_RW_FILE_NOT_FOUND)
return true;
}
}

14
x64_dbg_dbg/debugger_commands.cpp
View File

@ -812,6 +812,7 @@ static DWORD WINAPI scyllaThread(void* lpParam)
{
dputs("error loading Scylla.dll!");
bScyllaLoaded = false;
FreeLibrary(hScylla);
return 0;
}
ScyllaStartGui = (SCYLLASTARTGUI)GetProcAddress(hScylla, "ScyllaStartGui");
@ -819,6 +820,7 @@ static DWORD WINAPI scyllaThread(void* lpParam)
{
dputs("could not find export 'ScyllaStartGui' inside Scylla.dll");
bScyllaLoaded = false;
FreeLibrary(hScylla);
return 0;
}
if(dbgisdll())
@ -1324,7 +1326,7 @@ CMDRESULT cbDebugDisableMemoryBreakpoint(int argc, char* argv[])
CMDRESULT cbDebugDownloadSymbol(int argc, char* argv[])
{
char szDefaultStore[MAX_PATH] = "";
char szDefaultStore[MAX_SETTING_SIZE] = "";
const char* szSymbolStore = szDefaultStore;
if(!BridgeSettingGet("Symbols", "DefaultStore", szDefaultStore)) //get default symbol store from settings
{
@ -1390,8 +1392,8 @@ CMDRESULT cbDebugDownloadSymbol(int argc, char* argv[])
CMDRESULT cbDebugGetJITAuto(int argc, char* argv[])
{
bool jit_auto;
arch actual_arch;
bool jit_auto = false;
arch actual_arch = invalid;
if(argc == 1)
{
@ -1514,9 +1516,10 @@ CMDRESULT cbDebugSetJITAuto(int argc, char* argv[])
CMDRESULT cbDebugSetJIT(int argc, char* argv[])
{
arch actual_arch;
char* jit_debugger_cmd;
arch actual_arch = invalid;
char* jit_debugger_cmd = "";
char oldjit[MAX_SETTING_SIZE] = "";
char path[JIT_ENTRY_DEF_SIZE];
if(!IsProcessElevated())
{
dprintf("Error run the debugger as Admin to setjit\n");
@ -1524,7 +1527,6 @@ CMDRESULT cbDebugSetJIT(int argc, char* argv[])
}
if(argc < 2)
{
char path[JIT_ENTRY_DEF_SIZE];
dbggetdefjit(path);
jit_debugger_cmd = path;

2
x64_dbg_dbg/math.cpp
View File

@ -310,7 +310,7 @@ static bool printlayer(char* exp, EXPRESSION* exps, int layer, bool silent, bool
int len = close - open;
strncpy(temp, exp + open + 1, len - 1);
strcpy(backup, exp + open + len + 1);
strcpy_s(backup, exp + open + len + 1);
uint value;
if(!mathfromstring(temp, &value, silent, baseonly, 0, 0))

12
x64_dbg_dbg/simplescript.cpp
View File

@ -17,7 +17,7 @@ static bool volatile bIsRunning = false;
static SCRIPTBRANCHTYPE scriptgetbranchtype(const char* text)
{
char newtext[MAX_SCRIPT_LINE_SIZE] = "";
strcpy(newtext, text);
strcpy_s(newtext, text);
argformat(newtext); //format jump commands
if(!strstr(newtext, " "))
strcat(newtext, " ");
@ -157,7 +157,7 @@ static bool scriptcreatelinemap(const char* filename)
}
else //no space before comment
{
strcpy(line_comment, comment);
strcpy_s(line_comment, comment);
*comment = 0;
}
}
@ -177,7 +177,9 @@ static bool scriptcreatelinemap(const char* filename)
cur.type = linelabel;
sprintf(cur.u.label, "l %.*s", rawlen - 1, cur.raw); //create a fake command for formatting
argformat(cur.u.label); //format labels
strcpy(cur.u.label, cur.u.label + 2); //remove fake command
char temp[256] = "";
strcpy_s(temp, cur.u.label + 2);
strcpy_s(cur.u.label, temp); //remove fake command
if(!*cur.u.label or !strcmp(cur.u.label, "\"\"")) //no label text
{
char message[256] = "";
@ -341,7 +343,7 @@ static CMDRESULT scriptinternalcmdexec(const char* cmd)
else if(scriptisinternalcommand(cmd, "nop")) //do nothing
return STATUS_CONTINUE;
char command[deflen] = "";
strcpy(command, cmd);
strcpy_s(command, cmd);
argformat(command);
COMMAND* found = cmdfindmain(dbggetcommandlist(), command);
if(!found) //invalid command
@ -495,7 +497,7 @@ static DWORD WINAPI scriptLoadThread(void* filename)
void scriptload(const char* filename)
{
static char filename_[MAX_PATH] = "";
strcpy(filename_, filename);
strcpy_s(filename_, filename);
CloseHandle(CreateThread(0, 0, scriptLoadThread, filename_, 0, 0));
}

2
x64_dbg_dbg/symbolinfo.cpp
View File

@ -156,7 +156,7 @@ const char* symgetsymbolicname(uint addr)
if(SymFromAddr(fdProcessInfo->hProcess, (DWORD64)addr, &displacement, pSymbol) and !displacement)
{
if(!settingboolget("Engine", "UndecorateSymbolNames") or !UnDecorateSymbolName(pSymbol->Name, label, MAX_SYM_NAME, UNDNAME_COMPLETE))
strcpy(label, pSymbol->Name);
strcpy_s(label, pSymbol->Name);
retval = true;
}
}

2
x64_dbg_dbg/thread.cpp
View File

@ -93,7 +93,7 @@ bool threadsetname(DWORD dwThreadId, const char* name)
if(threadList.at(i).dwThreadId == dwThreadId)
{
if(name)
strcpy(threadList.at(i).threadName, name);
strcpy_s(threadList.at(i).threadName, name);
else
*threadList.at(i).threadName = '\0';
}

2
x64_dbg_dbg/value.cpp
View File

@ -1003,7 +1003,7 @@ bool valapifromstring(const char* name, uint* value, int* value_size, bool print
int len = (int)strlen(szModName);
while(szModName[len] != '\\')
len--;
strcpy(szBaseName, szModName + len + 1);
strcpy_s(szBaseName, szModName + len + 1);
HMODULE mod = LoadLibraryExA(szModName, 0, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
if(!mod)
{

6
x64_dbg_dbg/variable.cpp
View File

@ -150,7 +150,8 @@ bool varget(const char* name, uint* value, int* size, VAR_TYPE* type)
return true; //variable was valid, just get the size
if(type)
*type = vartype;
*value = varvalue.u.value;
if(value)
*value = varvalue.u.value;
return true;
}
@ -167,7 +168,8 @@ bool varget(const char* name, char* string, int* size, VAR_TYPE* type)
return true; //variable was valid, just get the size
if(type)
*type = vartype;
memcpy(string, &varvalue.u.data->front(), varsize);
if(string)
memcpy(string, &varvalue.u.data->front(), varsize);
return true;
}