Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DeskCalc: 

* Replace usage of strcpy by strlcpy (CID 6790)
 * Check the return value of FindApp before continuing (CID 2366)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40634 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Saint-Pierre 2011-02-23 02:08:03 +00:00
parent 08a750214c
commit 14afc67b4c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/apps/deskcalc/CalcView.cpp
View File

@ -957,13 +957,13 @@ CalcView::_ParseCalcDesc(const char* keypadDescription)
// set code
if (strcmp(key->label, "=") == 0)
strcpy(key->code, "\n");
strlcpy(key->code, "\n", sizeof(key->code));
else
strcpy(key->code, key->label);
strlcpy(key->code, key->label, sizeof(key->code));
// set keymap
if (strlen(key->label) == 1)
strcpy(key->keymap, key->label);
strlcpy(key->keymap, key->label, sizeof(key->keymap));
else
*key->keymap = '\0';
@ -1181,9 +1181,12 @@ void
CalcView::_FetchAppIcon(BBitmap* into)
{
entry_ref appRef;
be_roster->FindApp(kAppSig, &appRef);
BFile file(&appRef, B_READ_ONLY);
BAppFileInfo appInfo(&file);
if (appInfo.GetIcon(into, B_MINI_ICON) != B_OK)
status_t status = be_roster->FindApp(kAppSig, &appRef);
if (status == B_OK) {
BFile file(&appRef, B_READ_ONLY);
BAppFileInfo appInfo(&file);
status = appInfo.GetIcon(into, B_MINI_ICON);
}
if (status != B_OK)
memset(into->Bits(), 0, into->BitsLength());
}