From nobody Wed May 25 14:08:40 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AE90C1B4C5A5; Wed, 25 May 2022 14:08:40 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L7Xwm20tHz3lhZ; Wed, 25 May 2022 14:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653487720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ONzJED5YGb7qxBDRYws30l8siD2L0naBY2waUXFEHlA=; b=YrTESZs5vqYyuXpv9dtt/xQFlccKzHtIQdhaS4RG1IaO231++57EVIg7m/313z2nIr00i8 0ntlrngYBAblz3hv630A1Cu8jMA9Mvu4QrHZluV4KKbms9lP1ztHc9IziRxjF49/E7WDfs FlOVzNKzzHtJM2AWah9M7YxZ3N0cBIDR2yjx3tSLeJ514VA8FVsZoaUdA7ezH20ze9QpZj gk11CD6tX07LTQ+YMTvNQc/8UppwF/TrAVsoBs/QeHZa1maRWfNPYqV2WeH/8xE1PPVPbO CQUZJnSsvbqeRQaCyMlC1uMkfXWybMVSZNfZvwLVI/dBOjgrZTXvSbP7xVMVHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 257351AAAB; Wed, 25 May 2022 14:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24PE8eck025090; Wed, 25 May 2022 14:08:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24PE8eNe025089; Wed, 25 May 2022 14:08:40 GMT (envelope-from git) Date: Wed, 25 May 2022 14:08:40 GMT Message-Id: <202205251408.24PE8eNe025089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 59f6408d8d61 - main - diff3: Copy line into debug information List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59f6408d8d61740a4c083f811de2adef8ac3b8a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653487720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ONzJED5YGb7qxBDRYws30l8siD2L0naBY2waUXFEHlA=; b=XL91oidkTBQpjSCKxP90dSpj3G0fQhBSLN9gIV9PX1e+ewLmwEiH3J46V/ReSowI5KM3WM N8RAFvDFmxx+p0bAHvIiKbTZTUBDGjcgMiAA2B5FJX5LajHANB9XQbkb+Ln2H7mikRc9Mj uBvOQxdZfwDbWYQJsFnyFY/+na3hH/A6Kw4FAvRujIn5HVJvBXUCC53rr49rIXbs2RmRKK iYgbAqjz0poj5yGKoabHW5jgjdNLd2tncdCkrCYVg5KwTaflLYCFQPEjJPd9I5eaHoMejV 6wvuueC7m7Ghcodvvq4Gneia8J1R9lR5ZIu167ZVd2fNuG83QBvMB6H3wfW5+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653487720; a=rsa-sha256; cv=none; b=TjbubDZn4TxmQm7O98dQ2uJZQ3i6tS8udvMi087eNGWR7AS/g8NBsE/bfjnDtcVYgalPOZ UItNPAYN6hAu1ybrv7hlDTgk89UsvIYxNTH0S6c0WlC76AZICiK/DM3FOBagopzcJA68Up t/E3OlMnxNUp/28mhy+R1wdBsupExVIxRf/YM9ReNClSdwgdJU+TkeorY9gQvidRfQe7I7 b4erRu77fMobvukCsbpW/qdwbucgCV5mr8+0YbpMNCy9RJHm6sVmRqpJN9upU9ZdFhEufC AfMjXhkBnCxZGVJPA+EAEJO8kXnW86w1OrZajORUla+tmNMsvrJsVYKpZ5UA/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=59f6408d8d61740a4c083f811de2adef8ac3b8a8 commit 59f6408d8d61740a4c083f811de2adef8ac3b8a8 Author: Tom Jones AuthorDate: 2022-05-25 13:45:45 +0000 Commit: Tom Jones CommitDate: 2022-05-25 13:45:51 +0000 diff3: Copy line into debug information Sponsored by: Klara Inc. --- usr.bin/diff3/diff3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index c7756f35bfe2..a6d765ce0f75 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -535,7 +535,7 @@ edit(struct diff *diff, bool dup, int j, int difftype) de[j].type = difftype; #if DEBUG - de[j].line = diff->line; + de[j].line = strdup(diff->line); #endif /* DEBUG */ de[j].old.from = diff->old.from;