i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use short-circuit evaluation to avoid out-of-bounds string access. Thanks Jérôme!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41090 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström
2011-03-23 00:47:21 +00:00
parent e940d6c348
commit 2d5868f8b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/ContainerWindow.cpp
+2 -2
View File
@@ -171,7 +171,7 @@ StripShortcut(const Model *model, char *result, uint32 &shortcut)
// check if there is a shortcut in the model name // check if there is a shortcut in the model name
uint32 length = strlen(result); uint32 length = strlen(result);
if (result[length - 2] == '-' && length > 2) { if (length > 2 && result[length - 2] == '-') {
shortcut = result[length - 1]; shortcut = result[length - 1];
result[length - 2] = '\0'; result[length - 2] = '\0';
return; return;
@@ -180,7 +180,7 @@ StripShortcut(const Model *model, char *result, uint32 &shortcut)
// check if there is a shortcut in the filename // check if there is a shortcut in the filename
char* refName = model->EntryRef()->name; char* refName = model->EntryRef()->name;
length = strlen(refName); length = strlen(refName);
if (refName[length - 2] == '-' && length > 2) { if (length > 2 && refName[length - 2] == '-') {
shortcut = refName[length - 1]; shortcut = refName[length - 1];
return; return;
} }