From 18f1f4437f501ab24482d932b901f46c5f5bcfd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sun, 3 Aug 2014 10:40:26 +0200
Subject: [PATCH] Paranoia: Use guaranteed_memset() to CLEAR_ON_EXIT.
---
src/builtin.cmod | 2 +-
src/object.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/builtin.cmod b/src/builtin.cmod
index 118e86ac58..6c6796b894 100644
--- a/src/builtin.cmod
+++ b/src/builtin.cmod
@@ -3450,7 +3450,7 @@ PIKECLASS Buffer
if( str->str.s )
{
if( Pike_fp->flags & OBJECT_CLEAR_ON_EXIT )
- memset( str->str.s->str, 0, str->str.s->len );
+ guaranteed_memset( str->str.s->str, 0, str->str.s->len );
free_string_builder( &str->str );
}
}
diff --git a/src/object.c b/src/object.c
index 649e7658ec..e2ad36beec 100644
--- a/src/object.c
+++ b/src/object.c
@@ -959,7 +959,7 @@ PMOD_EXPORT void destruct_object (struct object *o, enum object_destruct_reason
POP_FRAME2();
if (o->storage && (o->flags & OBJECT_CLEAR_ON_EXIT)) {
- memset(o->storage, 0, p->storage_needed);
+ guaranteed_memset(o->storage, 0, p->storage_needed);
}
free_object( o );
--
GitLab