From 7dc46f21682316c8b2cd68c2d972c52b4830a8e6 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 20 Jul 2026 10:36:58 -0500 Subject: [PATCH] caget missing NULL check --- modules/ca/src/tools/caget.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/ca/src/tools/caget.c b/modules/ca/src/tools/caget.c index 82a276592..0d5c1d3e0 100644 --- a/modules/ca/src/tools/caget.c +++ b/modules/ca/src/tools/caget.c @@ -126,10 +126,15 @@ static void event_handler (evargs args) ppv->status = args.status; if (args.status == ECA_NORMAL) { + epicsUInt32 nBytes = dbr_size_n(args.type, args.count); ppv->dbrType = args.type; - ppv->value = calloc(1, dbr_size_n(args.type, args.count)); - memcpy(ppv->value, args.dbr, dbr_size_n(args.type, args.count)); - ppv->nElems = args.count; + ppv->value = calloc(1, nBytes); + if (ppv->value) { + memcpy(ppv->value, args.dbr, nBytes); + ppv->nElems = args.count; + } else { + ppv->status = ECA_ALLOCMEM; + } nRead++; } }