aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

Move check on number of search points to move_search_do

Browse Source 
If doc_view->document->number_of_search_points is 0, move_search_number
crashes at:

pt = doc_view->document->search_points;
x = pt[number].x;
y = pt[number].y;

so it is not sufficient to make find_first_search_in_view return
immediately in this case, move_search_do should return immediately.
This commit is contained in:
Fabienne Ducroquet 2018-06-07 17:25:21 +02:00
parent f2c0a380ab
commit 3665ee2ef7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/viewer/text/search.c
View File

@ -1285,9 +1285,6 @@ find_first_search_in_view(struct session *ses, struct document_view *doc_view)
int i; int i;
int current_search_number = doc_view->vs->current_search_number; int current_search_number = doc_view->vs->current_search_number;
if (!doc_view->document->number_of_search_points)
return;
if (current_search_number >= 0 && current_search_number < doc_view->document->number_of_search_points) { if (current_search_number >= 0 && current_search_number < doc_view->document->number_of_search_points) {
struct point *point = doc_view->document->search_points + current_search_number; struct point *point = doc_view->document->search_points + current_search_number;
@ -1307,6 +1304,9 @@ find_first_search_in_view(struct session *ses, struct document_view *doc_view)
static enum frame_event_status static enum frame_event_status
move_search_do(struct session *ses, struct document_view *doc_view, int direction) move_search_do(struct session *ses, struct document_view *doc_view, int direction)
{ {
if (!doc_view->document->number_of_search_points)
return FRAME_EVENT_OK;
int number; int number;
find_first_search_in_view(ses, doc_view); find_first_search_in_view(ses, doc_view);