From b47de46fa4189c8fa890851c1e63d57c6b7d1d9a Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Sun, 13 Apr 2025 19:15:26 +0200 Subject: Don't use assert to check if realloc() failed Avoid using assert as when building with NDEBUG defined they become a no-operation so the realloc is never done. Always perform the check and exit accordingly. --- lout/container.cc | 17 +++++++++++------ lout/misc.cc | 10 ++++++---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/lout/container.cc b/lout/container.cc index 48b353a6..f5d16818 100644 --- a/lout/container.cc +++ b/lout/container.cc @@ -2,6 +2,7 @@ * Dillo Widget * * Copyright 2005-2007 Sebastian Geerken + * Copyright 2025 Rodrigo Arias Mallo * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -140,9 +141,11 @@ void Vector::put(Object *newElement, int newPos) if (newPos >= numAlloc) { while (newPos >= numAlloc) numAlloc *= 2; - void *vp; - assert((vp = realloc(array, numAlloc * sizeof(Object*)))); - if (!vp) exit(-2); // when NDEBUG is defined + void *vp = realloc(array, numAlloc * sizeof(Object*)); + if (vp == NULL) { + perror("realloc failed"); + exit(1); + } array = (Object**)vp; } @@ -177,9 +180,11 @@ void Vector::insert(Object *newElement, int pos) if (numElements >= numAlloc) { // Allocated memory has to be increased. numAlloc *= 2; - void *vp; - assert((vp = realloc(array, numAlloc * sizeof(Object*)))); - if (!vp) exit(-2); // when NDEBUG is defined + void *vp = realloc(array, numAlloc * sizeof(Object*)); + if (vp == NULL) { + perror("realloc failed"); + exit(1); + } array = (Object**)vp; } diff --git a/lout/misc.cc b/lout/misc.cc index 72f01047..6bd5992d 100644 --- a/lout/misc.cc +++ b/lout/misc.cc @@ -2,6 +2,7 @@ * Dillo Widget * * Copyright 2005-2007 Sebastian Geerken + * Copyright 2025 Rodrigo Arias Mallo * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -163,10 +164,11 @@ void BitSet::set(int i, bool val) int newNumBytes = numBytes; while (8 * i >= newNumBytes) newNumBytes *= 2; - - void *vp; - assert((vp = realloc(bits, newNumBytes * sizeof(unsigned char)))); - if (!vp) exit(-2); // when NDEBUG is defined + void *vp = realloc(bits, newNumBytes * sizeof(unsigned char)); + if (vp == NULL) { + perror("realloc failed"); + exit(1); + } bits = (unsigned char*)vp; memset(bits + numBytes, 0, newNumBytes - numBytes); numBytes = newNumBytes; -- cgit v1.2.3