From owner-svn-src-all@FreeBSD.ORG  Sun Jun 27 14:11:03 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A3374106566B;
	Sun, 27 Jun 2010 14:11:03 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 91D168FC16;
	Sun, 27 Jun 2010 14:11:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5REB31b007383;
	Sun, 27 Jun 2010 14:11:03 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5REB39b007381;
	Sun, 27 Jun 2010 14:11:03 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201006271411.o5REB39b007381@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 27 Jun 2010 14:11:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209550 - head/usr.bin/tftp
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jun 2010 14:11:03 -0000

Author: gavin
Date: Sun Jun 27 14:11:03 2010
New Revision: 209550
URL: http://svn.freebsd.org/changeset/base/209550

Log:
  Fix core dump when server fails to respond.
  
  Reviewed by:	imp

Modified:
  head/usr.bin/tftp/tftp.c

Modified: head/usr.bin/tftp/tftp.c
==============================================================================
--- head/usr.bin/tftp/tftp.c	Sun Jun 27 12:19:09 2010	(r209549)
+++ head/usr.bin/tftp/tftp.c	Sun Jun 27 14:11:03 2010	(r209550)
@@ -229,7 +229,10 @@ recvfile(int peer, char *port, int fd, c
 		/* Otherwise it is a fatal error */
 		break;
 	}
-
+	if (i == 12) {
+		printf("Transfer timed out.\n");
+		return;
+	}
 	if (rp->th_opcode == ERROR) {
 		tftp_log(LOG_ERR, "Error code %d: %s", rp->th_code, rp->th_msg);
 		return;