From owner-svn-src-head@freebsd.org  Sat Apr 30 14:48:31 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 987B4B22AEE;
 Sat, 30 Apr 2016 14:48:31 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6A2F11AB2;
 Sat, 30 Apr 2016 14:48:31 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3UEmUha050760;
 Sat, 30 Apr 2016 14:48:30 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3UEmUQm050759;
 Sat, 30 Apr 2016 14:48:30 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201604301448.u3UEmUQm050759@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 30 Apr 2016 14:48:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298851 - head/usr.bin/sdiff
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Apr 2016 14:48:31 -0000

Author: bapt
Date: Sat Apr 30 14:48:30 2016
New Revision: 298851
URL: https://svnweb.freebsd.org/changeset/base/298851

Log:
  When checking for binary file, check if ch is not EOF only ch actually got
  a value assigned
  
  Reported by:	pfg

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

Modified: head/usr.bin/sdiff/sdiff.c
==============================================================================
--- head/usr.bin/sdiff/sdiff.c	Sat Apr 30 14:47:45 2016	(r298850)
+++ head/usr.bin/sdiff/sdiff.c	Sat Apr 30 14:48:30 2016	(r298851)
@@ -514,12 +514,14 @@ istextfile(FILE *f)
 	if (f == NULL)
 		return (1);
 	rewind(f);
-	for (i = 0; i <= MAX_CHECK || ch != EOF; i++) {
+	for (i = 0; i <= MAX_CHECK; i++) {
 		ch = fgetc(f);
 		if (ch == '\0') {
 			rewind(f);
 			return (0);
 		}
+		if (ch == EOF)
+			break;
 	}
 	rewind(f);
 	return (1);