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

HaikuDepot: Fixed some inconsistencies in List.h

Browse Source
This commit is contained in:
Stephan Aßmus 2013-12-10 23:07:16 +01:00
parent 55ef89adc2
commit 96c5f7eda4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/haiku-depot/List.h
View File

@ -120,10 +120,8 @@ public:
inline bool Add(const ItemType& copyFrom, int32 index) inline bool Add(const ItemType& copyFrom, int32 index)
{ {
if (index < 0) if (index < 0 || index >= (int32)fCount)
index = 0; return false;
if (index > (int32)fCount)
index = fCount;
if (!_Resize(fCount + 1)) if (!_Resize(fCount + 1))
return false; return false;
@ -190,7 +188,7 @@ public:
inline const ItemType& ItemAt(int32 index) const inline const ItemType& ItemAt(int32 index) const
{ {
if (index >= (int32)fCount) if (index < 0 || index >= (int32)fCount)
return fNullItem; return fNullItem;
return ItemAtFast(index); return ItemAtFast(index);
} }
@ -202,6 +200,8 @@ public:
inline const ItemType& LastItem() const inline const ItemType& LastItem() const
{ {
if (fCount == 0)
return fNullItem;
return ItemAt((int32)fCount - 1); return ItemAt((int32)fCount - 1);
} }