public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/
Date: Mon, 18 Apr 2022 20:28:36 +0000 (UTC)	[thread overview]
Message-ID: <1650313708.482e7cfce9dff16b7457c507accbc7e7dcf8ed6c.sam@gentoo> (raw)

commit:     482e7cfce9dff16b7457c507accbc7e7dcf8ed6c
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon Apr 18 06:17:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 20:28:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482e7cfc

dev-cpp/gtest: fix testcase failure with musl

Empirically, "getpagesize() * 12" instead of "getpagesize() * 10"
appears to be enough to memory to stave off a stack overflow when built
against musl libc.

Closes: https://bugs.gentoo.org/834068
Closes: https://github.com/gentoo/gentoo/pull/25073
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
index 3e06777ac9a9..0c47681ba347 100644
--- a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
+++ b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
@@ -1,4 +1,5 @@
 Bug: https://bugs.gentoo.org/692464
+     https://bugs.gentoo.org/834068
 
 --- a/googletest/src/gtest-death-test.cc
 +++ b/googletest/src/gtest-death-test.cc
@@ -7,7 +8,7 @@ Bug: https://bugs.gentoo.org/692464
    if (!use_fork) {
      static const bool stack_grows_down = StackGrowsDown();
 -    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
-+    const auto stack_size = static_cast<size_t>(getpagesize() * 10);
++    const auto stack_size = static_cast<size_t>(getpagesize() * 12);
      // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
      void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
                               MAP_ANON | MAP_PRIVATE, -1, 0);


             reply	other threads:[~2022-04-18 20:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-18 20:28 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-07-19 10:43 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/files/ Joonas Niilola

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1650313708.482e7cfce9dff16b7457c507accbc7e7dcf8ed6c.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox