summaryrefslogtreecommitdiff
path: root/src/Fl_Tree_Item_Array.cxx
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2019-01-25 17:39:20 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2019-01-25 17:40:51 +0100
commit2c5ba944582a8101cd3fd7445814a2e50b4701bd (patch)
treeee8f8dbe9fc9e5aab1aedee44cadafd4ba976cab /src/Fl_Tree_Item_Array.cxx
parent9b272cfa4e664b0a90540256edf030c43e4bfbb0 (diff)
Fix Fl_Tree::insert() with pos out ouf range (#18)
The given position to insert a new item was not checked against the valid range so the program could crash if a position less than zero or greater than children() was given. The position is now clamped to the valid range, i.e. the item is either prepended or appended. Fixes issue #18.
Diffstat (limited to 'src/Fl_Tree_Item_Array.cxx')
-rw-r--r--src/Fl_Tree_Item_Array.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Fl_Tree_Item_Array.cxx b/src/Fl_Tree_Item_Array.cxx
index 1da368c9a..0503a8000 100644
--- a/src/Fl_Tree_Item_Array.cxx
+++ b/src/Fl_Tree_Item_Array.cxx
@@ -109,9 +109,14 @@ void Fl_Tree_Item_Array::enlarge(int count) {
/// Insert an item at index position \p pos.
///
/// Handles enlarging array if needed, total increased by 1.
-/// If \p pos == total(), an empty item is appended to the array.
+/// If \p pos \>= total(), the item is appended to the array.
+/// If \p pos \< 0, the item is prepended (works like pos == 0).
///
void Fl_Tree_Item_Array::insert(int pos, Fl_Tree_Item *new_item) {
+ if (pos < 0)
+ pos = 0;
+ else if (pos > _total)
+ pos = _total;
enlarge(1);
// printf("*** POS=%d TOTAL-1=%d NITEMS=%d\n", pos, _total-1, (_total-pos));
if ( pos <= (_total - 1) ) { // need to move memory around?