From 8bd93f3746d18101d992ecf3736c1b4d77e4a65f Mon Sep 17 00:00:00 2001
From: otto <>
Date: Wed, 13 Jan 2010 12:40:11 +0000
Subject: New options 'S', as a shorthand for the options most suitable as an
 extra safeguard (FGJ). Idea from deraadt@; ok deraadt@ dlg@

---
 src/lib/libc/stdlib/malloc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/lib/libc/stdlib/malloc.c')

diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 9bdea862f2..9cee3e5935 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.123 2009/12/16 08:23:53 otto Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.124 2010/01/13 12:40:11 otto Exp $	*/
 /*
  * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
  *
@@ -661,6 +661,10 @@ omalloc_init(struct dir_info **dp)
 			case 'R':
 				mopts.malloc_realloc = 1;
 				break;
+			case 'S':
+				mopts.malloc_freeprot = mopts.malloc_junk = 1;
+				mopts.malloc_guard = MALLOC_PAGESIZE;
+				break;
 			case 'x':
 				mopts.malloc_xmalloc = 0;
 				break;
-- 
cgit v1.2.3-55-g6feb