diff --git a/ChangeLog b/ChangeLog
index 9e46b63d..faa27234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-10  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (edit_draw): Skip a zero-length match only when there
+	/is/ a match.  Found with valgrind.  This fixes Savannah bug #41908.
+
 2015-11-08  Benno Schulenberg  <bensberg@justemail.net>
 	* src/global.c (shortcut_init): Allow exiting from the file browser
 	with the same key (^T) as it was entered (as ^G for the help viewer).
diff --git a/src/winio.c b/src/winio.c
index 53025405..6b8e5271 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2613,7 +2613,7 @@ void edit_draw(filestruct *fileptr, const char *converted, int
 		    goto step_two;
 
 		/* Skip over a zero-length regex match. */
-		if (startmatch.rm_so == startmatch.rm_eo)
+		if (start_line != NULL && startmatch.rm_so == startmatch.rm_eo)
 		    startmatch.rm_eo++;
 		else {
 		    /* If no start was found, skip to the next step. */