Range check input to Fl_Choice::value(n).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2497 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Jul 9, 2002 · 0cca486 · 0cca486
1 parent 81d431c
commit 0cca486
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.1.0
 
+	- Fl_Choice::value(n) didn't range check "n".
 	- The MingW and OS/2 makeinclude files didn't have the
 	  new fltk_images library definitions.
 	- Fl_Text_Editor didn't scroll the text in the widget

diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.9 2002/04/11 10:46:19 easysw Exp $"
+// "$Id: Fl_Choice.cxx,v 1.10.2.5.2.10 2002/07/09 17:18:45 easysw Exp $"
 //
 // Choice widget for the Fast Light Tool Kit (FLTK).
 //
@@ -85,6 +85,7 @@ Fl_Choice::Fl_Choice(int x,int y,int w,int h, const char *l)
 }
 
 int Fl_Choice::value(int v) {
+  if (v < 0 || v >= (size() - 1)) return 0;
   if (!Fl_Menu_::value(v)) return 0;
   redraw();
   return 1;
@@ -128,5 +129,5 @@ int Fl_Choice::handle(int e) {
 }
 
 //
-// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.9 2002/04/11 10:46:19 easysw Exp $".
+// End of "$Id: Fl_Choice.cxx,v 1.10.2.5.2.10 2002/07/09 17:18:45 easysw Exp $".
 //