From 2c5ba944582a8101cd3fd7445814a2e50b4701bd Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Fri, 25 Jan 2019 17:39:20 +0100 Subject: 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. --- src/Fl_Tree_Item.cxx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/Fl_Tree_Item.cxx') diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx index 2b3e3602a..666a54674 100644 --- a/src/Fl_Tree_Item.cxx +++ b/src/Fl_Tree_Item.cxx @@ -387,10 +387,17 @@ Fl_Tree_Item *Fl_Tree_Item::add(const Fl_Tree_Prefs &prefs, : 0; // failed? error } -/// Insert a new item named \p 'new_label' into current item's -/// children at a specified position \p 'pos'. -/// \returns the new item inserted. -/// +/** + Insert a new item named \p 'new_label' into current item's + children at a specified position \p 'pos'. + + If \p pos is out of range the new item is + - prepended if \p pos \< 0 or + - appended if \p pos \> item->children(). + + \returns the new item inserted + \see Fl_Tree::insert() +*/ Fl_Tree_Item *Fl_Tree_Item::insert(const Fl_Tree_Prefs &prefs, const char *new_label, int pos) { Fl_Tree_Item *item = new Fl_Tree_Item(_tree); item->label(new_label); -- cgit v1.2.3