From 921d900a72b771575e79021f685e13dcd68922dc Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 15 Jan 2007 14:39:11 +0000 Subject: [PATCH] Report error if NULL pointer supplied to dm_strdup_aux(). --- WHATS_NEW | 1 + lib/mm/dbg_malloc.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index df9b6b4..3eb81fc 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 1.02.15 - =================================== + Report error if NULL pointer is supplied to dm_strdup_aux(). Reinstate dm_event_get_registered_device. Version 1.02.14 - 11th January 2007 diff --git a/lib/mm/dbg_malloc.c b/lib/mm/dbg_malloc.c index 8986b21..54d8384 100644 --- a/lib/mm/dbg_malloc.c +++ b/lib/mm/dbg_malloc.c @@ -20,9 +20,14 @@ char *dm_strdup_aux(const char *str, const char *file, int line) { - char *ret = dm_malloc_aux_debug(strlen(str) + 1, file, line); + char *ret; - if (ret) + if (!str) { + log_error("Internal error: dm_strdup called with NULL pointer"); + return NULL; + } + + if ((ret = dm_malloc_aux_debug(strlen(str) + 1, file, line))) strcpy(ret, str); return ret; -- 2.43.5