diff options
| author |  yang-g <yangg@google.com> | 2016-04-20 16:38:26 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-04-20 16:38:26 -0700 |
| commit | e2914023068da2ded0f825cd1790b1c70f14e0a5 (patch) | |
| tree | abbade79a6e2b15dbe3748129d80ab3c18b19b9d /src/core/lib/support/alloc.c | |
| parent | 25df28ef75ba99e5d16743be7310c2920ddd8a32 (diff) | |
| parent | 2aec20120020741ee64fcd22042c2e56d4cf0a5b (diff) | |
Merge remote-tracking branch 'upstream/master' into proto_comments
Diffstat (limited to 'src/core/lib/support/alloc.c')
| -rw-r--r-- | src/core/lib/support/alloc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/lib/support/alloc.c b/src/core/lib/support/alloc.c index 020917f79c..618c3f6acd 100644 --- a/src/core/lib/support/alloc.c +++ b/src/core/lib/support/alloc.c @@ -53,6 +53,7 @@ void gpr_set_allocation_functions(gpr_allocation_functions functions) { void *gpr_malloc(size_t size) { void *p; + if (size == 0) return NULL; GPR_TIMER_BEGIN("gpr_malloc", 0); p = g_alloc_functions.malloc_fn(size); if (!p) { @@ -69,6 +70,7 @@ void gpr_free(void *p) { } void *gpr_realloc(void *p, size_t size) { + if ((size == 0) && (p == NULL)) return NULL; GPR_TIMER_BEGIN("gpr_realloc", 0); p = g_alloc_functions.realloc_fn(p, size); if (!p) { |