Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

sprintf->snprintf, fix some too short buffers

Browse Source
This commit is contained in:
Henrik Rydgard 2014-09-14 00:14:11 +02:00
parent 170e88838f
commit f84ebf6bff
18 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Config.cpp
View File

@ -744,7 +744,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
char keyName[64];
std::string fileName;
sprintf(keyName, "FileName%d", i);
snprintf(keyName, sizeof(keyName), "FileName%d", i);
if (recent->Get(keyName, &fileName, "") && !fileName.empty()) {
recentIsos.push_back(fileName);
}
@ -853,7 +853,7 @@ void Config::Save() {
for (int i = 0; i < iMaxRecent; i++) {
char keyName[64];
sprintf(keyName,"FileName%d",i);
snprintf(keyName, sizeof(keyName), "FileName%d", i);
if (i < (int)recentIsos.size()) {
recent->Set(keyName, recentIsos[i]);
} else {

13
Core/Debugger/DisassemblyManager.cpp
View File

@ -959,7 +959,7 @@ void DisassemblyData::createLines()
} else {
while (pos < end)
{
char buffer[64];
char buffer[256];
u32 value;
u32 currentPos = pos;
@ -968,12 +968,12 @@ void DisassemblyData::createLines()
{
case DATATYPE_BYTE:
value = Memory::Read_U8(pos);
sprintf(buffer,"0x%02X",value);
snprintf(buffer, sizeof(buffer), "0x%02X", value);
pos++;
break;
case DATATYPE_HALFWORD:
value = Memory::Read_U16(pos);
sprintf(buffer,"0x%04X",value);
snprintf(buffer, sizeof(buffer), "0x%04X", value);
pos += 2;
break;
case DATATYPE_WORD:
@ -981,9 +981,9 @@ void DisassemblyData::createLines()
value = Memory::Read_U32(pos);
const std::string label = symbolMap.GetLabelString(value);
if (!label.empty())
sprintf(buffer,"%s",label.c_str());
snprintf(buffer, sizeof(buffer), "%s", label.c_str());
else
sprintf(buffer,"0x%08X",value);
snprintf(buffer, sizeof(buffer), "0x%08X", value);
pos += 4;
}
break;
@ -1007,8 +1007,7 @@ void DisassemblyData::createLines()
currentLine += buffer;
}
if (currentLine.size() != 0)
{
if (currentLine.size() != 0) {
DataEntry entry = {currentLine,pos-currentLineStart,lineCount++};
lines[currentLineStart] = entry;
lineAddresses.push_back(currentLineStart);

4
Core/HLE/sceKernelMemory.cpp
View File

@ -20,6 +20,8 @@
#include <vector>
#include <map>
#include "base/compat.h"
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/HLE/FunctionWrappers.h"
@ -899,7 +901,7 @@ public:
void GetQuickInfo(char *ptr, int size)
{
int sz = alloc->GetBlockSizeFromAddress(address);
sprintf(ptr, "MemPart: %08x - %08x size: %08x", address, address + sz, sz);
snprintf(ptr, size, "MemPart: %08x - %08x size: %08x", address, address + sz, sz);
}
static u32 GetMissingErrorCode() { return SCE_KERNEL_ERROR_UNKNOWN_UID; }
static int GetStaticIDType() { return PPSSPP_KERNEL_TMID_PMB; }

2
Core/MIPS/ARM/ArmJit.cpp
View File

@ -53,7 +53,7 @@ void DisassembleArm(const u8 *data, int size) {
continue;
}
}
ArmDis((u32)codePtr, inst, temp);
ArmDis((u32)codePtr, inst, temp, sizeof(temp), true);
ILOG("A: %s", temp);
}
}

10
Core/SaveState.cpp
View File

@ -289,11 +289,11 @@ namespace SaveState
std::string GenerateSaveSlotFilename(int slot, const char *extension)
{
char discID[256];
char temp[256];
sprintf(discID, "%s_%s",
char temp[2048];
snprintf(discID, sizeof(discID), "%s_%s",
g_paramSFO.GetValueString("DISC_ID").c_str(),
g_paramSFO.GetValueString("DISC_VERSION").c_str());
sprintf(temp, "ms0:/PSP/PPSSPP_STATE/%s_%i.%s", discID, slot, extension);
snprintf(temp, sizeof(temp), "ms0:/PSP/PPSSPP_STATE/%s_%i.%s", discID, slot, extension);
std::string hostPath;
if (pspFileSystem.GetHostPath(std::string(temp), hostPath)) {
return hostPath;
@ -306,8 +306,8 @@ namespace SaveState
{
I18NCategory *sy = GetI18NCategory("System");
g_Config.iCurrentStateSlot = (g_Config.iCurrentStateSlot + 1) % SaveState::SAVESTATESLOTS;
char msg[30];
sprintf(msg, "%s: %d", sy->T("Savestate Slot"), g_Config.iCurrentStateSlot + 1);
char msg[128];
snprintf(msg, sizeof(msg), "%s: %d", sy->T("Savestate Slot"), g_Config.iCurrentStateSlot + 1);
osm.Show(msg);
}

5
UI/DevScreens.cpp
View File

@ -17,6 +17,7 @@
#include <algorithm>
#include "base/compat.h"
#include "gfx_es2/gl_state.h"
#include "i18n/i18n.h"
#include "ui/ui_context.h"
@ -447,7 +448,7 @@ std::vector<std::string> DisassembleArm2(const u8 *data, int size) {
continue;
}
}
ArmDis((u32)(intptr_t)codePtr, inst, temp, false);
ArmDis((u32)(intptr_t)codePtr, inst, temp, sizeof(temp), false);
std::string buf = temp;
lines.push_back(buf);
}
@ -471,7 +472,7 @@ void JitCompareScreen::UpdateDisasm() {
JitBlock *block = blockCache->GetBlock(currentBlock_);
char temp[256];
sprintf(temp, "%i/%i\n%08x", currentBlock_, blockCache->GetNumBlocks(), block->originalAddress);
snprintf(temp, sizeof(temp), "%i/%i\n%08x", currentBlock_, blockCache->GetNumBlocks(), block->originalAddress);
blockName_->SetText(temp);
// Alright. First generate the MIPS disassembly.

4
UI/MiscScreens.cpp
View File

@ -415,7 +415,7 @@ void LogoScreen::render() {
I18NCategory *c = GetI18NCategory("PSPCredits");
char temp[256];
sprintf(temp, "%s Henrik Rydg\xc3\xa5rd", c->T("created", "Created by"));
snprintf(temp, sizeof(temp), "%s Henrik Rydg\xc3\xa5rd", c->T("created", "Created by"));
#ifdef GOLD
dc.Draw()->DrawImage(I_ICONGOLD, bounds.centerX() - 120, bounds.centerY() - 30, 1.2f, colorAlpha(0xFFFFFFFF, alphaText), ALIGN_CENTER);
#else
@ -626,7 +626,7 @@ void CreditsScreen::render() {
// TODO: This is kinda ugly, done on every frame...
char temp[256];
sprintf(temp, "PPSSPP %s", PPSSPP_GIT_VERSION);
snprintf(temp, sizeof(temp), "PPSSPP %s", PPSSPP_GIT_VERSION);
credits[0] = (const char *)temp;
UIContext &dc = *screenManager()->getUIContext();

6
UI/NativeApp.cpp
View File

@ -602,12 +602,12 @@ void TakeScreenshot() {
gameId = "MENU";
}
char filename[256];
char filename[2048];
while (i < 10000){
if (g_Config.bScreenshotsAsPNG)
sprintf(filename, "%s/PSP/SCREENSHOT/%s_%05d.png", g_Config.memCardDirectory.c_str(), gameId.c_str(), i);
snprintf(filename, sizeof(filename), "%s/PSP/SCREENSHOT/%s_%05d.png", g_Config.memCardDirectory.c_str(), gameId.c_str(), i);
else
sprintf(filename, "%s/PSP/SCREENSHOT/%s_%05d.jpg", g_Config.memCardDirectory.c_str(), gameId.c_str(), i);
snprintf(filename, sizeof(filename), "%s/PSP/SCREENSHOT/%s_%05d.jpg", g_Config.memCardDirectory.c_str(), gameId.c_str(), i);
FileInfo info;
if (!getFileInfo(filename, &info))
break;

20
Windows/Debugger/BreakpointWindow.cpp
View File

@ -1,6 +1,10 @@
#include <stdio.h>
#include "base/compat.h"
#include "BreakpointWindow.h"
#include "../resource.h"
#include <stdio.h>
BreakpointWindow* BreakpointWindow::bp;
@ -29,11 +33,11 @@ INT_PTR CALLBACK BreakpointWindow::dlgFunc(HWND hwnd, UINT iMsg, WPARAM wParam,
if (bp->address != -1)
{
sprintf(str,"0x%08X",bp->address);
snprintf(str, sizeof(str), "0x%08X", bp->address);
SetWindowTextA(GetDlgItem(hwnd,IDC_BREAKPOINT_ADDRESS),str);
}
sprintf(str,"0x%08X",bp->size);
snprintf(str, sizeof(str), "0x%08X", bp->size);
SetWindowTextA(GetDlgItem(hwnd,IDC_BREAKPOINT_SIZE),str);
SetWindowTextA(GetDlgItem(hwnd,IDC_BREAKPOINT_CONDITION),bp->condition);
@ -123,14 +127,14 @@ bool BreakpointWindow::fetchDialogData(HWND hwnd)
GetWindowTextA(GetDlgItem(hwnd,IDC_BREAKPOINT_ADDRESS),str,256);
if (cpu->initExpression(str,exp) == false)
{
sprintf(errorMessage,"Invalid expression \"%s\".",str);
snprintf(errorMessage, sizeof(errorMessage), "Invalid expression \"%s\".",str);
MessageBoxA(hwnd,errorMessage,"Error",MB_OK);
return false;
}
if (cpu->parseExpression(exp,address) == false)
{
sprintf(errorMessage,"Invalid expression \"%s\".",str);
snprintf(errorMessage, sizeof(errorMessage), "Invalid expression \"%s\".",str);
MessageBoxA(hwnd,errorMessage,"Error",MB_OK);
return false;
}
@ -141,14 +145,14 @@ bool BreakpointWindow::fetchDialogData(HWND hwnd)
GetWindowTextA(GetDlgItem(hwnd,IDC_BREAKPOINT_SIZE),str,256);
if (cpu->initExpression(str,exp) == false)
{
sprintf(errorMessage,"Invalid expression \"%s\".",str);
snprintf(errorMessage, sizeof(errorMessage), "Invalid expression \"%s\".",str);
MessageBoxA(hwnd,errorMessage,"Error",MB_OK);
return false;
}
if (cpu->parseExpression(exp,size) == false)
{
sprintf(errorMessage,"Invalid expression \"%s\".",str);
snprintf(errorMessage, sizeof(errorMessage), "Invalid expression \"%s\".",str);
MessageBoxA(hwnd,errorMessage,"Error",MB_OK);
return false;
}
@ -161,7 +165,7 @@ bool BreakpointWindow::fetchDialogData(HWND hwnd)
{
if (cpu->initExpression(condition,compiledCondition) == false)
{
sprintf(errorMessage,"Invalid expression \"%s\".",str);
snprintf(errorMessage, sizeof(errorMessage), "Invalid expression \"%s\".",str);
MessageBoxA(hwnd,errorMessage,"Error",MB_OK);
return false;
}

35
Windows/Debugger/CtrlDisAsmView.cpp
View File

@ -1106,15 +1106,15 @@ void CtrlDisAsmView::updateStatusBarText()
{
if (!Memory::IsValidAddress(line.info.dataAddress))
{
sprintf(text,"Invalid address %08X",line.info.dataAddress);
snprintf(text, sizeof(text), "Invalid address %08X",line.info.dataAddress);
} else {
switch (line.info.dataSize)
{
case 1:
sprintf(text,"[%08X] = %02X",line.info.dataAddress,Memory::Read_U8(line.info.dataAddress));
snprintf(text, sizeof(text), "[%08X] = %02X",line.info.dataAddress,Memory::Read_U8(line.info.dataAddress));
break;
case 2:
sprintf(text,"[%08X] = %04X",line.info.dataAddress,Memory::Read_U16(line.info.dataAddress));
snprintf(text, sizeof(text), "[%08X] = %04X",line.info.dataAddress,Memory::Read_U16(line.info.dataAddress));
break;
case 4:
// TODO: Could also be a float...
@ -1123,9 +1123,9 @@ void CtrlDisAsmView::updateStatusBarText()
const std::string addressSymbol = symbolMap.GetLabelString(data);
if (!addressSymbol.empty())
{
sprintf(text,"[%08X] = %s (%08X)",line.info.dataAddress,addressSymbol.c_str(),data);
snprintf(text, sizeof(text), "[%08X] = %s (%08X)",line.info.dataAddress,addressSymbol.c_str(),data);
} else {
sprintf(text,"[%08X] = %08X",line.info.dataAddress,data);
snprintf(text, sizeof(text), "[%08X] = %08X",line.info.dataAddress,data);
}
break;
}
@ -1141,13 +1141,12 @@ void CtrlDisAsmView::updateStatusBarText()
const std::string addressSymbol = symbolMap.GetLabelString(line.info.branchTarget);
if (addressSymbol.empty())
{
sprintf(text,"%08X",line.info.branchTarget);
snprintf(text, sizeof(text), "%08X", line.info.branchTarget);
} else {
sprintf(text,"%08X = %s",line.info.branchTarget,addressSymbol.c_str());
snprintf(text, sizeof(text), "%08X = %s",line.info.branchTarget,addressSymbol.c_str());
}
}
} else if (line.type == DISTYPE_DATA)
{
} else if (line.type == DISTYPE_DATA) {
u32 start = symbolMap.GetDataStart(curAddress);
if (start == -1)
start = curAddress;
@ -1155,25 +1154,23 @@ void CtrlDisAsmView::updateStatusBarText()
u32 diff = curAddress-start;
const std::string label = symbolMap.GetLabelString(start);
if (!label.empty())
{
if (!label.empty()) {
if (diff != 0)
sprintf(text,"%08X (%s) + %08X",start,label.c_str(),diff);
snprintf(text, sizeof(text), "%08X (%s) + %08X",start,label.c_str(),diff);
else
sprintf(text,"%08X (%s)",start,label.c_str());
snprintf(text, sizeof(text), "%08X (%s)",start,label.c_str());
} else {
if (diff != 0)
sprintf(text,"%08X + %08X",start,diff);
snprintf(text, sizeof(text), "%08X + %08X",start,diff);
else
sprintf(text,"%08X",start);
snprintf(text, sizeof(text), "%08X",start);
}
}
SendMessage(GetParent(wnd),WM_DEB_SETSTATUSBARTEXT,0,(LPARAM)text);
const std::string label = symbolMap.GetLabelString(line.info.opcodeAddress);
if (!label.empty())
{
if (!label.empty()) {
SendMessage(GetParent(wnd),WM_DEB_SETSTATUSBARTEXT,1,(LPARAM)label.c_str());
}
}
@ -1373,12 +1370,12 @@ void CtrlDisAsmView::disassembleToFile()
MessageBox(wnd,L"Finished!",L"Done",MB_OK);
}
void CtrlDisAsmView::getOpcodeText(u32 address, char* dest)
void CtrlDisAsmView::getOpcodeText(u32 address, char* dest, int bufsize)
{
DisassemblyLineInfo line;
address = manager.getStartAddress(address);
manager.getLine(address,displaySymbols,line);
sprintf(dest,"%s %s",line.name.c_str(),line.params.c_str());
snprintf(dest, bufsize, "%s %s",line.name.c_str(),line.params.c_str());
}
void CtrlDisAsmView::scrollStepping(u32 newPc)

2
Windows/Debugger/CtrlDisAsmView.h
View File

@ -103,7 +103,7 @@ public:
void scanFunctions();
void clearFunctions() { manager.clear(); };
void getOpcodeText(u32 address, char* dest);
void getOpcodeText(u32 address, char* dest, int bufsize);
int getRowHeight() { return rowHeight; };
u32 yToAddress(int y);

7
Windows/Debugger/Debugger_Disasm.cpp
View File

@ -721,11 +721,10 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
void CDisasm::updateThreadLabel(bool clear)
{
char label[512];
if (clear)
{
sprintf(label,"Thread: -");
if (clear) {
snprintf(label, sizeof(label), "Thread: -");
} else {
sprintf(label,"Thread: %s",threadList->getCurrentThreadName());
snprintf(label, sizeof(label), "Thread: %s", threadList->getCurrentThreadName());
}
SetDlgItemText(m_hDlg, IDC_THREADNAME, ConvertUTF8ToWString(label).c_str());

4
Windows/Debugger/Debugger_Lists.cpp
View File

@ -524,7 +524,7 @@ void CtrlBreakpointList::GetColumnText(wchar_t* dest, int row, int col)
wcscpy(dest,L"-");
} else {
char temp[256];
disasm->getOpcodeText(displayedBreakPoints_[index].addr, temp);
disasm->getOpcodeText(displayedBreakPoints_[index].addr, temp, sizeof(temp));
std::wstring s = ConvertUTF8ToWString(temp);
wcscpy(dest,s.c_str());
}
@ -694,7 +694,7 @@ void CtrlStackTraceView::GetColumnText(wchar_t* dest, int row, int col)
case SF_CUROPCODE:
{
char temp[512];
disasm->getOpcodeText(frames[row].pc,temp);
disasm->getOpcodeText(frames[row].pc, temp, sizeof(temp));
wcscpy(dest, ConvertUTF8ToWString(temp).c_str());
}
break;

7
Windows/Debugger/DumpMemoryWindow.cpp
View File

@ -74,10 +74,9 @@ INT_PTR CALLBACK DumpMemoryWindow::dlgFunc(HWND hwnd, UINT iMsg, WPARAM wParam,
break;
FILE* output = fopen(bp->fileName,"wb");
if (output == NULL)
{
char errorMessage[256];
sprintf(errorMessage,"Could not open file \"%s\".",bp->fileName);
if (output == NULL) {
char errorMessage[2048];
snprintf(errorMessage, sizeof(errorMessage), "Could not open file \"%s\".",bp->fileName);
MessageBoxA(hwnd,errorMessage,"Error",MB_OK);
break;
}

2
ext/disarm.cpp
View File

@ -1269,7 +1269,7 @@ const char *ArmRegName(int r) {
return reg_names[r];
}
void ArmDis(unsigned int addr, unsigned int w, char *output, bool includeWord) {
void ArmDis(unsigned int addr, unsigned int w, char *output, int bufsize, bool includeWord) {
pInstruction instr = instr_disassemble(w, addr, &options);
char temp[256];
if (includeWord) {

2
ext/disarm.h
View File

@ -31,4 +31,4 @@
// program with this function.
const char *ArmRegName(int r);
void ArmDis(unsigned int addr, unsigned int w, char *output, bool includeWord = true);
void ArmDis(unsigned int addr, unsigned int w, char *output, int bufsize, bool includeWord);

2
native

@ -1 +1 @@
Subproject commit 33d496d76f529a6b921c4c8fef70e6c5fd2caef7
Subproject commit 6ee862b564bca639659a231937e02dfec0774475

2
unittest/UnitTest.cpp
View File

@ -246,7 +246,7 @@ bool CheckLast(ArmGen::ARMXEmitter &emit, const char *comp) {
u32 instr;
memcpy(&instr, emit.GetCodePtr() - 4, 4);
char disasm[512];
ArmDis(0, instr, disasm);
ArmDis(0, instr, disasm, sizeof(disasm), true);
EXPECT_EQ_STR(std::string(disasm), std::string(comp));
return true;
}