git: 946a297fbd9a - stable/13 - sort: Fix random sort

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Mon, 01 Nov 2021 13:23:06 UTC
The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=946a297fbd9a01a433f2cfb5fa0ae86df07ee593

commit 946a297fbd9a01a433f2cfb5fa0ae86df07ee593
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-10-29 18:25:42 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-11-01 13:10:54 +0000

    sort: Fix random sort
    
    bwsrawdata() is supposed to return the string buffer.
    
    PR:             259451
    Reported by:    sigsys@gmail.com
    Fixes:          d053fb22f6d3 ("usr.bin/sort: Avoid UBSan errors")
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit e9bfb50d5e7aa5d673a5a35318820320c4190d33)
---
 usr.bin/sort/bwstring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index c31cb859cb37..2f2737e94314 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -152,7 +152,7 @@ bwsprintf(FILE *f, struct bwstring *bws, const char *prefix, const char *suffix)
 const void* bwsrawdata(const struct bwstring *bws)
 {
 
-	return (&(bws->wdata));
+	return (bws->wdata.str);
 }
 
 size_t bwsrawlen(const struct bwstring *bws)