From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 1 Dec 2021 14:53:31 +0000 (-0600)
Subject: Gracefully deal with malloc failures in module_ctx.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37dccf8a2b671caf0c576db1c36d3cafc7fb15dd;p=thirdparty%2Ffreeradius-server.git

Gracefully deal with malloc failures in module_ctx.h
---

diff --git a/src/lib/server/module_ctx.h b/src/lib/server/module_ctx.h
index 904c7a733af..60ec5bf0393 100644
--- a/src/lib/server/module_ctx.h
+++ b/src/lib/server/module_ctx.h
@@ -71,7 +71,8 @@ static module_ctx_t *module_ctx_from_inst(TALLOC_CTX *ctx, module_inst_ctx_t con
 {
 	module_ctx_t *nmctx;
 
-	MEM(nmctx = talloc_zero(ctx, module_ctx_t));
+	nmctx = talloc_zero(ctx, module_ctx_t);
+	if (unlikely(!nmctx)) return NULL;
 	nmctx->inst = mctx->inst;
 
 	return nmctx;
@@ -84,7 +85,8 @@ static module_ctx_t *module_ctx_from_thread_inst(TALLOC_CTX *ctx, module_thread_
 {
 	module_ctx_t *nmctx;
 
-	MEM(nmctx = talloc_zero(ctx, module_ctx_t));
+	nmctx = talloc_zero(ctx, module_ctx_t);
+	if (unlikely(!nmctx)) return NULL;
 	nmctx->inst = mctx->inst;
 	nmctx->thread = mctx->thread;
 
@@ -99,6 +101,7 @@ static module_ctx_t *module_ctx_dup(TALLOC_CTX *ctx, module_ctx_t const *mctx)
 	module_ctx_t *nmctx;
 
 	nmctx = talloc_zero(ctx, module_ctx_t);
+	if (unlikely(!nmctx)) return NULL;
 	memcpy(nmctx, mctx, sizeof(*nmctx));
 
 	return nmctx;