From 8d6e6e40c5d1540396d1d8e4c44c319464f7eca4 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 4 Jul 2004 23:27:48 +0000 Subject: Fl_Help_View::find() did not check for a NULL value (STR #442) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3500 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ src/Fl_Help_View.cxx | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index b8c74889a..31205db07 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ CHANGES IN FLTK 1.1.5rc2 - Documentation updates (STR #365, STR #399, STR #412) + - Fl_Help_View::find() did not check for a NULL value + (STR #442) - Added search symbol to the search field of Fl_Help_Dialog (STR #417) - Added two new symbols, @search and @FLTK, which can be diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index d1d105200..28c798e9b 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.cxx,v 1.1.2.49 2004/04/11 04:38:57 easysw Exp $" +// "$Id: Fl_Help_View.cxx,v 1.1.2.50 2004/07/04 23:27:48 easysw Exp $" // // Fl_Help_View widget routines. // @@ -782,8 +782,8 @@ Fl_Help_View::find(const char *s, // I - String to find *sp; // Search string pointer - // Range check input... - if (!s) return -1; + // Range check input and value... + if (!s || !value_) return -1; if (p < 0 || p >= (int)strlen(value_)) p = 0; else if (p > 0) p ++; @@ -2795,5 +2795,5 @@ hscrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx,v 1.1.2.49 2004/04/11 04:38:57 easysw Exp $". +// End of "$Id: Fl_Help_View.cxx,v 1.1.2.50 2004/07/04 23:27:48 easysw Exp $". // -- cgit v1.2.3