From owner-svn-src-stable-9@FreeBSD.ORG  Sun Nov 18 06:21:46 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4DA34DF4;
 Sun, 18 Nov 2012 06:21:46 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3204D8FC14;
 Sun, 18 Nov 2012 06:21:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAI6LkQB068558;
 Sun, 18 Nov 2012 06:21:46 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAI6LkxT068557;
 Sun, 18 Nov 2012 06:21:46 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211180621.qAI6LkxT068557@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 18 Nov 2012 06:21:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243210 - stable/9/usr.sbin/ndiscvt
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Nov 2012 06:21:46 -0000

Author: eadler
Date: Sun Nov 18 06:21:45 2012
New Revision: 243210
URL: http://svnweb.freebsd.org/changeset/base/243210

Log:
  MFC r243074:
  	Add a missing check for fread
  
  Approved by:	cperciva (implicit)

Modified:
  stable/9/usr.sbin/ndiscvt/ndiscvt.c
Directory Properties:
  stable/9/usr.sbin/ndiscvt/   (props changed)

Modified: stable/9/usr.sbin/ndiscvt/ndiscvt.c
==============================================================================
--- stable/9/usr.sbin/ndiscvt/ndiscvt.c	Sun Nov 18 05:19:08 2012	(r243209)
+++ stable/9/usr.sbin/ndiscvt/ndiscvt.c	Sun Nov 18 06:21:45 2012	(r243210)
@@ -325,6 +325,8 @@ main(int argc, char *argv[])
 	rewind (fp);
 	img = calloc(fsize, 1);
 	n = fread (img, fsize, 1, fp);
+	if (n == 0)
+		err(1, "reading .SYS file '%s' failed", sysfile);
 
 	fclose(fp);