From patchwork Fri Apr 2 17:34:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Openvpn-devel] Fix potential NULL ptr crash if compiled with DMALLOC X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 1704 Message-Id: <20210402173414.14216-1-gert@greenie.muc.de> To: openvpn-devel@lists.sourceforge.net Date: Fri, 2 Apr 2021 19:34:14 +0200 From: Gert Doering List-Id: In the unlikely case that we are compiled with -DDMALLOC *and* malloc() returns NULL, there is an uncaught memset() which would crash then. Remove the memset(), as the right the next operation after check_malloc_return() is a mempcy() which will overwrite the whole memory block anyway. Trac: #586 Signed-off-by: Gert Doering Acked-by: Antonio Quartulli --- src/openvpn/buffer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index 48bf25d5..e7031a4f 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -706,7 +706,6 @@ string_alloc(const char *str, struct gc_arena *gc) */ #ifdef DMALLOC ret = openvpn_dmalloc(file, line, n); - memset(ret, 0, n); #else ret = calloc(1, n); #endif