From owner-svn-src-all@freebsd.org  Thu Dec  3 14:04:43 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4DC2F4A7724;
 Thu,  3 Dec 2020 14:04:43 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CmyJW1mSkz3pFb;
 Thu,  3 Dec 2020 14:04:43 +0000 (UTC)
 (envelope-from mhorne@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F6521A666;
 Thu,  3 Dec 2020 14:04:43 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B3E4hOw096675;
 Thu, 3 Dec 2020 14:04:43 GMT (envelope-from mhorne@FreeBSD.org)
Received: (from mhorne@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B3E4hm7096674;
 Thu, 3 Dec 2020 14:04:43 GMT (envelope-from mhorne@FreeBSD.org)
Message-Id: <202012031404.0B3E4hm7096674@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mhorne set sender to
 mhorne@FreeBSD.org using -f
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Thu, 3 Dec 2020 14:04:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r368301 - stable/12/usr.bin/bsdiff/bsdiff
X-SVN-Group: stable-12
X-SVN-Commit-Author: mhorne
X-SVN-Commit-Paths: stable/12/usr.bin/bsdiff/bsdiff
X-SVN-Commit-Revision: 368301
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.34
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Dec 2020 14:04:43 -0000

Author: mhorne
Date: Thu Dec  3 14:04:42 2020
New Revision: 368301
URL: https://svnweb.freebsd.org/changeset/base/368301

Log:
  MFC r367734:
  bsdiff: fix off-by-one error

Modified:
  stable/12/usr.bin/bsdiff/bsdiff/bsdiff.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/bsdiff/bsdiff/bsdiff.c
==============================================================================
--- stable/12/usr.bin/bsdiff/bsdiff/bsdiff.c	Thu Dec  3 11:59:40 2020	(r368300)
+++ stable/12/usr.bin/bsdiff/bsdiff/bsdiff.c	Thu Dec  3 14:04:42 2020	(r368301)
@@ -212,7 +212,7 @@ int main(int argc,char *argv[])
 
 		for(scsc=scan+=len;scan<newsize;scan++) {
 			len=search(I,old,oldsize,new+scan,newsize-scan,
-					0,oldsize,&pos);
+					0,oldsize-1,&pos);
 
 			for(;scsc<scan+len;scsc++)
 			if((scsc+lastoffset<oldsize) &&