commit: c680482145f31b0e20aae17bb9fbb2984e102aae Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Sun Jul 12 14:18:44 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sat Aug 8 09:04:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6804821
dev-libs/spdlog: fix tests segfault Closes: https://bugs.gentoo.org/731238 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: David Roman <davidroman96 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16678 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch | 13 +++++++++++++ dev-libs/spdlog/spdlog-1.6.1-r1.ebuild | 1 + 2 files changed, 14 insertions(+) diff --git a/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch new file mode 100644 index 00000000000..8a6aa8020f7 --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-1.6.1-tests-fix.patch @@ -0,0 +1,13 @@ +diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h +index e974cf51..5393dcac 100644 +--- a/include/spdlog/fmt/bin_to_hex.h ++++ b/include/spdlog/fmt/bin_to_hex.h +@@ -92,7 +92,7 @@ struct formatter<spdlog::details::dump_info<T>> + auto parse(ParseContext &ctx) -> decltype(ctx.begin()) + { + auto it = ctx.begin(); +- while (*it && *it != '}') ++ while (it != ctx.end() && *it != '}') + { + switch (*it) + { diff --git a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild index 04237834f6c..6d996c6f8ea 100644 --- a/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild +++ b/dev-libs/spdlog/spdlog-1.6.1-r1.ebuild @@ -31,6 +31,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-libfmt-7.0.0.patch" + "${FILESDIR}/${P}-tests-fix.patch" ) src_prepare() {
