From d40eb87cc00f50a5debb8899eacb7fcf1065badf Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 12 Oct 2023 23:45:40 -0400 Subject: bfstd: Actually use the copied locale This fixes a segfault in xstrerror() when using musl. --- src/bfstd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bfstd.c b/src/bfstd.c index e9214d4..a4ae439 100644 --- a/src/bfstd.c +++ b/src/bfstd.c @@ -301,7 +301,7 @@ const char *xstrerror(int errnum) { } if (copy != (locale_t)0) { - ret = strerror_l(errnum, loc); + ret = strerror_l(errnum, copy); } if (loc == LC_GLOBAL_LOCALE) { -- cgit v1.2.3 From 5dbab7e7815800ea6a110519154f05485457b194 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 12 Oct 2023 23:47:04 -0400 Subject: tests: Don't crash if unbuffer isn't installed --- tests/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.sh b/tests/tests.sh index 662efd9..f233f74 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -495,7 +495,7 @@ elif command -v expect_unbuffer &>/dev/null; then fi function bfs_pty() { - test -n "$UNBUFFER" || skip + test -n "${UNBUFFER:-}" || skip bfs_verbose "$@" "$UNBUFFER" bash -c 'stty cols 80 rows 24 && "$@"' bash "${BFS[@]}" "$@" -- cgit v1.2.3 From c25fa4fb5e58e20ce97c3747c05d26307a70baaa Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 12 Oct 2023 23:50:16 -0400 Subject: Release 3.0.4 --- GNUmakefile | 2 +- docs/CHANGELOG.md | 12 ++++++++++++ src/config.h | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 27d6674..011e397 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -6,7 +6,7 @@ VERSION := $(shell git describe --always 2>/dev/null) endif ifndef VERSION -VERSION := 3.0.3 +VERSION := 3.0.4 endif ifndef OS diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 253dd46..3b07f01 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,18 @@ 3.* === +3.0.4 +----- + +**October 12, 2023** + +### Bug Fixes + +- Fixed a segfault when reporting errors under musl ([`d40eb87`]) + +[`d40eb87`]: https://github.com/tavianator/bfs/commit/d40eb87cc00f50a5debb8899eacb7fcf1065badf + + 3.0.3 ----- diff --git a/src/config.h b/src/config.h index 980980a..38ca69b 100644 --- a/src/config.h +++ b/src/config.h @@ -22,7 +22,7 @@ # define BFS_COMMAND "bfs" #endif #ifndef BFS_VERSION -# define BFS_VERSION "3.0.3" +# define BFS_VERSION "3.0.4" #endif #ifndef BFS_HOMEPAGE # define BFS_HOMEPAGE "https://tavianator.com/projects/bfs.html" -- cgit v1.2.3