===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/search.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/less/search.c	2016/09/17 15:06:41	1.18
--- src/usr.bin/less/search.c	2017/08/02 19:35:57	1.19
***************
*** 477,484 ****
  	char *searchp;
  	char *line_end = line + line_len;
  
- 	if (sp == NULL || ep == NULL)
- 		return;
  	/*
  	 * sp and ep delimit the first match in the line.
  	 * Mark the corresponding file positions, then
--- 477,482 ----
***************
*** 491,496 ****
--- 489,497 ----
  	 */
  	searchp = line;
  	do {
+ 		if (sp == NULL || ep == NULL)
+ 			return;
+ 
  		create_hilites(linepos, (intptr_t)sp - (intptr_t)line,
  		    (intptr_t)ep - (intptr_t)line, chpos);
  		/*