summaryrefslogtreecommitdiff
path: root/test/cctest
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2016-09-16 22:45:00 -0700
committerRich Trott <rtrott@gmail.com>2016-09-21 22:47:33 -0700
commitd2eb7ce0105369a9cad82787cb33a665e9bd00ad (patch)
tree1bf8e4caca2d4fa073263773d82114de6e0f80eb /test/cctest
parent7b7d50a29e098cea525892ad51e61cfa2897e8b8 (diff)
downloadandroid-node-v8-d2eb7ce0105369a9cad82787cb33a665e9bd00ad.tar.gz
android-node-v8-d2eb7ce0105369a9cad82787cb33a665e9bd00ad.tar.bz2
android-node-v8-d2eb7ce0105369a9cad82787cb33a665e9bd00ad.zip
src: Malloc/Calloc size 0 returns non-null pointer
Change `Malloc()/Calloc()` so that size zero does not return a null pointer, consistent with prior behavior. Fixes: https://github.com/nodejs/node/issues/8571 PR-URL: https://github.com/nodejs/node/pull/8572 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@keybase.io> Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'test/cctest')
-rw-r--r--test/cctest/util.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/test/cctest/util.cc b/test/cctest/util.cc
index 862024aff3..79f1524660 100644
--- a/test/cctest/util.cc
+++ b/test/cctest/util.cc
@@ -89,3 +89,17 @@ TEST(UtilTest, ToLower) {
EXPECT_EQ('a', ToLower('a'));
EXPECT_EQ('a', ToLower('A'));
}
+
+TEST(UtilTest, Malloc) {
+ using node::Malloc;
+ EXPECT_NE(nullptr, Malloc(0));
+ EXPECT_NE(nullptr, Malloc(1));
+}
+
+TEST(UtilTest, Calloc) {
+ using node::Calloc;
+ EXPECT_NE(nullptr, Calloc(0, 0));
+ EXPECT_NE(nullptr, Calloc(1, 0));
+ EXPECT_NE(nullptr, Calloc(0, 1));
+ EXPECT_NE(nullptr, Calloc(1, 1));
+} \ No newline at end of file