git: 0ca88d564187 - stable/12 - Fix mismerge that crept into r301289.

[Warner Losh]

The branch stable/12 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=0ca88d56418731b16dd81d096bdbf3b88de90b68

commit 0ca88d56418731b16dd81d096bdbf3b88de90b68
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2019-06-03 05:25:16 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-10 17:11:15 +0000

    Fix mismerge that crept into r301289.
    
    The conversion of 0 -> NULL required a rebase at some point, as noted
    in r301289 when pfg commited it. In that rebase, three lines remained
    that had been removed in a prior version of awk, and one of them had a
    0 -> NULL change causing a conflict. The conflict should have been
    resolved by removing the three lines, but wasn't. This introduces a
    regression into f.split3 test which prior to this commit we were
    failing, but a pure onetrueawk wasn't. Remove the offending 3 lines.
    
    (cherry picked from commit 31d232c2a3c18fb05e5b2f1ec42872708cbfd27e)
---
 contrib/one-true-awk/run.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c
index d74b54ca3445..1859263f7f4b 100644
--- a/contrib/one-true-awk/run.c
+++ b/contrib/one-true-awk/run.c
@@ -1387,9 +1387,6 @@ Cell *split(Node **a, int nnn)	/* split(a[0], a[1], a[2]); a[3] is type */
 	tempfree(y);
 	free(origs);
 	free(origfs);
-	if (a[2] != NULL && arg3type == STRING) {
-		tempfree(x);
-	}
 	x = gettemp();
 	x->tval = NUM;
 	x->fval = n;