Skip to content

Commit 9d3691f

Browse files
committed
src: remove UncheckedMalloc(0) workaround
Assuming that UncheckedMalloc(0) returns a non-nullptr is non-standard and we use other allocators as well (e.g., OPENSSL_malloc) that do not guarantee this behavior. It is the caller's responsibility to check that size != 0 implies UncheckedMalloc(size) != nullptr, and that's exactly what the checked variants (Malloc etc.) already do. The current behavior is also inconsistent with UncheckedRealloc(), which always returns a nullptr when the size is 0, and with the documentation in src/README.md. Refs: #8571 Refs: #8572
1 parent addb726 commit 9d3691f

File tree

2 files changed

+19
-21
lines changed

2 files changed

+19
-21
lines changed

src/util-inl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,11 @@ T* UncheckedRealloc(T* pointer, size_t n) {
361361
// As per spec realloc behaves like malloc if passed nullptr.
362362
template <typename T>
363363
inline T* UncheckedMalloc(size_t n) {
364-
if (n == 0) n = 1;
365364
return UncheckedRealloc<T>(nullptr, n);
366365
}
367366

368367
template <typename T>
369368
inline T* UncheckedCalloc(size_t n) {
370-
if (n == 0) n = 1;
371369
MultiplyWithOverflowCheck(sizeof(T), n);
372370
return static_cast<T*>(calloc(n, sizeof(T)));
373371
}

test/cctest/test_util.cc

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,39 +97,39 @@ TEST(UtilTest, ToLower) {
9797
EXPECT_EQ('a', ToLower('A'));
9898
}
9999

100-
#define TEST_AND_FREE(expression) \
100+
#define TEST_AND_FREE(expression, size) \
101101
do { \
102-
auto pointer = expression; \
103-
EXPECT_NE(nullptr, pointer); \
102+
auto pointer = expression(size); \
103+
if (size != 0) EXPECT_NE(pointer, nullptr); \
104104
free(pointer); \
105105
} while (0)
106106

107107
TEST(UtilTest, Malloc) {
108-
TEST_AND_FREE(Malloc<char>(0));
109-
TEST_AND_FREE(Malloc<char>(1));
110-
TEST_AND_FREE(Malloc(0));
111-
TEST_AND_FREE(Malloc(1));
108+
TEST_AND_FREE(Malloc<char>, 0);
109+
TEST_AND_FREE(Malloc<char>, 1);
110+
TEST_AND_FREE(Malloc, 0);
111+
TEST_AND_FREE(Malloc, 1);
112112
}
113113

114114
TEST(UtilTest, Calloc) {
115-
TEST_AND_FREE(Calloc<char>(0));
116-
TEST_AND_FREE(Calloc<char>(1));
117-
TEST_AND_FREE(Calloc(0));
118-
TEST_AND_FREE(Calloc(1));
115+
TEST_AND_FREE(Calloc<char>, 0);
116+
TEST_AND_FREE(Calloc<char>, 1);
117+
TEST_AND_FREE(Calloc, 0);
118+
TEST_AND_FREE(Calloc, 1);
119119
}
120120

121121
TEST(UtilTest, UncheckedMalloc) {
122-
TEST_AND_FREE(UncheckedMalloc<char>(0));
123-
TEST_AND_FREE(UncheckedMalloc<char>(1));
124-
TEST_AND_FREE(UncheckedMalloc(0));
125-
TEST_AND_FREE(UncheckedMalloc(1));
122+
TEST_AND_FREE(UncheckedMalloc<char>, 0);
123+
TEST_AND_FREE(UncheckedMalloc<char>, 1);
124+
TEST_AND_FREE(UncheckedMalloc, 0);
125+
TEST_AND_FREE(UncheckedMalloc, 1);
126126
}
127127

128128
TEST(UtilTest, UncheckedCalloc) {
129-
TEST_AND_FREE(UncheckedCalloc<char>(0));
130-
TEST_AND_FREE(UncheckedCalloc<char>(1));
131-
TEST_AND_FREE(UncheckedCalloc(0));
132-
TEST_AND_FREE(UncheckedCalloc(1));
129+
TEST_AND_FREE(UncheckedCalloc<char>, 0);
130+
TEST_AND_FREE(UncheckedCalloc<char>, 1);
131+
TEST_AND_FREE(UncheckedCalloc, 0);
132+
TEST_AND_FREE(UncheckedCalloc, 1);
133133
}
134134

135135
template <typename T>

0 commit comments

Comments
 (0)