git: 59f6408d8d61 - main - diff3: Copy line into debug information
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 May 2022 14:08:40 UTC
The branch main has been updated by thj:
URL: https://cgit.FreeBSD.org/src/commit/?id=59f6408d8d61740a4c083f811de2adef8ac3b8a8
commit 59f6408d8d61740a4c083f811de2adef8ac3b8a8
Author: Tom Jones <thj@FreeBSD.org>
AuthorDate: 2022-05-25 13:45:45 +0000
Commit: Tom Jones <thj@FreeBSD.org>
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;