mirror of
https://github.com/OpenVPN/openvpn.git
synced 2024-09-20 12:02:28 +02:00
Fix potential NULL ptr crash if compiled with DMALLOC
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 <gert@greenie.muc.de> Acked-by: Antonio Quartulli <antonio@openvpn.net> Message-Id: <20210402173414.14216-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21981.html Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
parent
411fc52eb1
commit
e2acfad40c
@ -706,7 +706,6 @@ string_alloc(const char *str, struct gc_arena *gc)
|
|||||||
*/
|
*/
|
||||||
#ifdef DMALLOC
|
#ifdef DMALLOC
|
||||||
ret = openvpn_dmalloc(file, line, n);
|
ret = openvpn_dmalloc(file, line, n);
|
||||||
memset(ret, 0, n);
|
|
||||||
#else
|
#else
|
||||||
ret = calloc(1, n);
|
ret = calloc(1, n);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user