From 838a68bd3008e28bcae263d36c56ef8f4c19c9a9 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 19 Oct 2017 16:34:33 +0000 Subject: 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@ --- src/lib/libc/stdlib/malloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 0d43ad8a13..851f585553 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c @@ -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 * Copyright (c) 2012 Matthew Dempsky @@ -1458,6 +1458,7 @@ freezero(void *ptr, size_t sz) if (!mopts.internal_funcs) { freezero_p(ptr, sz); + return; } d = getpool(); -- cgit v1.2.3-55-g6feb