commit: d50088b3d4fd368f392c82ac95b67a499cdb7032 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Aug 28 19:25:03 2021 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sat Aug 28 19:42:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50088b3
www-client/chromium: remove unused patch Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/22145 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> .../files/chromium-92-GetUsableSize-nullptr.patch | 46 ---------------------- 1 file changed, 46 deletions(-) diff --git a/www-client/chromium/files/chromium-92-GetUsableSize-nullptr.patch b/www-client/chromium/files/chromium-92-GetUsableSize-nullptr.patch deleted file mode 100644 index e36ed1b6615..00000000000 --- a/www-client/chromium/files/chromium-92-GetUsableSize-nullptr.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 61e16c92ff24bb71b9b7309a9d6d470ee91738bc Mon Sep 17 00:00:00 2001 -From: Bartek Nowierski <bart...@chromium.org> -Date: Wed, 21 Jul 2021 15:01:38 +0000 -Subject: [PATCH] [PA] Make GetUsableSize() handle nullptr gracefully - -malloc_usable_size() is expected to not crush on NULL and return 0. - -Bug: 1221442 -Change-Id: I6a3b90dcf3a8ad18114c206d87b98f60d5f50eb1 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3042177 -Commit-Queue: Bartek Nowierski <bart...@chromium.org> -Commit-Queue: Kentaro Hara <hara...@chromium.org> -Auto-Submit: Bartek Nowierski <bart...@chromium.org> -Reviewed-by: Kentaro Hara <hara...@chromium.org> -Cr-Commit-Position: refs/heads/master@{#903900} ---- - -diff --git a/base/allocator/partition_allocator/partition_alloc_unittest.cc b/base/allocator/partition_allocator/partition_alloc_unittest.cc -index c1212011..8863984 100644 ---- a/base/allocator/partition_allocator/partition_alloc_unittest.cc -+++ b/base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -2838,6 +2838,10 @@ - } - } - -+TEST_F(PartitionAllocTest, GetUsableSizeNull) { -+ EXPECT_EQ(0ULL, PartitionRoot<ThreadSafe>::GetUsableSize(nullptr)); -+} -+ - TEST_F(PartitionAllocTest, GetUsableSize) { - size_t delta = SystemPageSize() + 1; - for (size_t size = 1; size <= kMinDirectMappedDownsize; size += delta) { -diff --git a/base/allocator/partition_allocator/partition_root.h b/base/allocator/partition_allocator/partition_root.h -index b72a1d9..baac9525 100644 ---- a/base/allocator/partition_allocator/partition_root.h -+++ b/base/allocator/partition_allocator/partition_root.h -@@ -1220,6 +1220,9 @@ - // PartitionAlloc's internal data. Used as malloc_usable_size. - template <bool thread_safe> - ALWAYS_INLINE size_t PartitionRoot<thread_safe>::GetUsableSize(void* ptr) { -+ // malloc_usable_size() is expected to handle NULL gracefully and return 0. -+ if (!ptr) -+ return 0; - auto* slot_span = SlotSpan::FromSlotInnerPtr(ptr); - auto* root = FromSlotSpan(slot_span); - return slot_span->GetUsableSize(root);
