summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2015-12-18 21:56:59 +0000
committerStefan Bühler <stbuehler@web.de>2015-12-18 21:56:59 +0000
commit737d4f0f20aeb75898c46673af1afd9ed4b5b3c7 (patch)
tree34e8739683ed643108af199dd7821f07fa128f3a
parent53c4ab8438781b3b655028dc7a4b9a9163686d1f (diff)
downloadlighttpd-git-737d4f0f20aeb75898c46673af1afd9ed4b5b3c7.tar.gz
[core] fix memset_s call (fixes #2698)
From: Stefan Bühler <stbuehler@web.de> git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3064 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS1
-rw-r--r--src/safe_memclear.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a381dba0..6dd33d30 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ NEWS
====
- 1.4.39
+ * [core] fix memset_s call (fixes #2698)
- 1.4.38 - 2015-12-05
* [stat-cache] fix handling of collisions, might have returned wrong data (fixes #2669)
diff --git a/src/safe_memclear.c b/src/safe_memclear.c
index 45747a46..cec39b75 100644
--- a/src/safe_memclear.c
+++ b/src/safe_memclear.c
@@ -41,7 +41,7 @@ static void* safe_memset(void *s, int c, size_t n)
void safe_memclear(void *s, size_t n) {
#if defined(HAVE_MEMSET_S)
- memset_s(s, 0, n);
+ memset_s(s, n, 0, n);
#elif defined(HAVE_EXPLICIT_BZERO)
explicit_bzero(s, n);
#else