summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2013-02-04 20:15:10 +0000
committerStefan Fritsch <sf@apache.org>2013-02-04 20:15:10 +0000
commitd5a372ff7823987661fe6d548cbf78c99de38db5 (patch)
treebf614f4588598538991f220d9a689e964bab30f9
parent4b36695126263f1d17749ebf1066d941dacac3cb (diff)
downloadhttpd-d5a372ff7823987661fe6d548cbf78c99de38db5.tar.gz
Fix valgrind warning about uninitialized memory in argument to semctl
PR: 53690 Submitted by: Mikhail T. <mi+apache aldan algebra com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1442326 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES3
-rw-r--r--os/unix/unixd.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index b7c0cbc7b9..b6d1469e26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) core: Fix valgrind warning about uninitialized memory in argument to
+ semctl. PR 53690. [Mikhail T. <mi+apache aldan algebra com>]
+
*) mod_proxy_connect: Don't keepalive the connection to the client if the
backend closes the connection. PR 54474. [Pavel Mateja <pavel netsafe cz>]
diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 2a953f0f38..a86630f39b 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -241,7 +241,7 @@ AP_DECLARE(apr_status_t) ap_unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex)
};
#endif
union semun ick;
- struct semid_ds buf;
+ struct semid_ds buf = { { 0 } };
apr_os_proc_mutex_get(&ospmutex, pmutex);
buf.sem_perm.uid = ap_unixd_config.user_id;