Browse Source

Restore a return that was inadvertently removed from freezero() in r1.234,

which results in an internal double free when internal functions are not
in use.
ok otto@
OPENBSD_6_3
jsing 7 years ago
parent
commit
edffe314c0
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      src/lib/libc/stdlib/malloc.c

+ 2
- 1
src/lib/libc/stdlib/malloc.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: malloc.c,v 1.234 2017/10/05 04:44:49 otto Exp $ */
/* $OpenBSD: malloc.c,v 1.235 2017/10/19 16:34:33 jsing Exp $ */
/* /*
* Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
* Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@ -1458,6 +1458,7 @@ freezero(void *ptr, size_t sz)
if (!mopts.internal_funcs) { if (!mopts.internal_funcs) {
freezero_p(ptr, sz); freezero_p(ptr, sz);
return;
} }
d = getpool(); d = getpool();


Loading…
Cancel
Save