aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar jboeuf <jboeuf@users.noreply.github.com>2017-04-13 13:55:10 -0700
committerGravatar GitHub <noreply@github.com>2017-04-13 13:55:10 -0700
commit2d89ac442919c260153133b32c3f9c98d0b5371d (patch)
treea87d9dd07c4cc7060120b5608fd3afae290d9e44
parent110dae8b69da94d5db8b5b7868d7f112e0707d95 (diff)
parentd6547f45d1fd2c85f8e860db7894ab19411c52f2 (diff)
Merge pull request #10633 from jboeuf/gpr_free_never_fails_on_null_input
Making sure that gpr_free is a no-op for NULL input.
-rw-r--r--include/grpc/support/alloc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h
index 541433c688..017d75a3d0 100644
--- a/include/grpc/support/alloc.h
+++ b/include/grpc/support/alloc.h
@@ -68,7 +68,8 @@ GPRAPI void gpr_free_aligned(void *ptr);
/** Request the family of allocation functions in \a functions be used. NOTE
* that this request will be honored in a *best effort* basis and that no
- * guarantees are made about the default functions (eg, malloc) being called. */
+ * guarantees are made about the default functions (eg, malloc) being called.
+ * The functions.free_fn implementation must be a no-op for NULL input. */
GPRAPI void gpr_set_allocation_functions(gpr_allocation_functions functions);
/** Return the family of allocation functions currently in effect. */