Hi, On 02/04/2021 19:34, Gert Doering wrote: > 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 <g...@greenie.muc.de> > --- > 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 >
As discussed with Gert on IRC, we could rather add a "if (ret)" before doing memset. However the DMALLOC code path is barely tested at all and we don't want to introduce more changes than needed. So for now, we can live with this change. Acked-by: Antonio Quartulli <anto...@openvpn.net> -- Antonio Quartulli _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
