===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/list.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src/usr.bin/ftp/list.c	2009/05/05 19:35:30	1.3
+++ src/usr.bin/ftp/list.c	2010/06/27 20:00:58	1.4
@@ -1,4 +1,4 @@
-/*	$OpenBSD: list.c,v 1.3 2009/05/05 19:35:30 martynas Exp $	*/
+/*	$OpenBSD: list.c,v 1.4 2010/06/27 20:00:58 phessler Exp $	*/
 
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
@@ -34,6 +34,8 @@
 			*type = *tok;
 
 		if (field == 7) {
+			if (line == NULL || *line == NULL)
+				break;
 			while (**line == ' ' || **line == '\t')
 				(*line)++;
 			break;
@@ -58,6 +60,8 @@
 			*type = 'd';
 
 		if (field == 2) {
+			if (line == NULL || *line == NULL)
+				break;
 			while (**line == ' ' || **line == '\t')
 				(*line)++;
 			break;