diff options
author | Jim Jagielski <jim@apache.org> | 2013-03-11 16:38:39 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2013-03-11 16:38:39 +0000 |
commit | 51cdbaeefd2f0b442e3555e9db1198dd254d80ff (patch) | |
tree | 6ba1ff6f28d0da10ac18580d5826db405f6a0739 /os | |
parent | a689b6b197cfd35f861be1e78ade3ae83a87aac8 (diff) | |
download | httpd-51cdbaeefd2f0b442e3555e9db1198dd254d80ff.tar.gz |
Merge r1442865, r1442759, r1442326, r1442309, r1448171, r1418556, r1448453, r1425771, r1425772, r1425775 from trunk:
Change bzero/bcopy into memset/memcpy
PR 54346
Can't figure out why we allocate len+2 bytes here. Len+1 should be enough.
Fix valgrind warning about uninitialized memory in argument to semctl
PR: 53690
Submitted by: Mikhail T. <mi+apache aldan algebra com>
fix valgrind warnings about uninitialized memory in syscall arguments
This is useful info for mod_status ;)
Add some __attribute__ for automatic format checking.
Correct one catch in sed0.c.
Correct some spelling.
Replace strdup by ap_malloc to ensure a proper error message if out-of-memory.
While there, only allocate memory for the string part we actually use.
PR: 54345
Exit with error message if out of mem
htdbm, htpasswd: print error message if out of memory
PR: 54345
Submitted by: jailletc36, sf, sf, jim, jailletc36, minfrin, sf, sf, sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1455225 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os')
-rw-r--r-- | os/unix/unixd.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |