diff options
author | jim <jim@13f79535-47bb-0310-9956-ffa450edef68> | 2013-10-09 14:20:59 +0000 |
---|---|---|
committer | jim <jim@13f79535-47bb-0310-9956-ffa450edef68> | 2013-10-09 14:20:59 +0000 |
commit | a62c25ccbb10622427400ad7158ed80dccd7c4cb (patch) | |
tree | 8ae0954e23692310db2400ce69cdca1127c3b595 /shmem | |
parent | d7e108e399450ac57118f4ef15db10a9c8ba7173 (diff) | |
download | libapr-a62c25ccbb10622427400ad7158ed80dccd7c4cb.tar.gz |
Merge r910597 from trunk:
Make sure we don't leak file descriptors.
Submitted by: jfclere
Reviewed/backported by: jim
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1530623 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'shmem')
-rw-r--r-- | shmem/unix/shm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/shmem/unix/shm.c b/shmem/unix/shm.c index 80d56894f..73a729df9 100644 --- a/shmem/unix/shm.c +++ b/shmem/unix/shm.c @@ -314,26 +314,31 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, * exist before calling ftok(). */ shmkey = ftok(filename, 1); if (shmkey == (key_t)-1) { + apr_file_close(file); return errno; } if ((new_m->shmid = shmget(shmkey, new_m->realsize, SHM_R | SHM_W | IPC_CREAT | IPC_EXCL)) < 0) { + apr_file_close(file); return errno; } if ((new_m->base = shmat(new_m->shmid, NULL, 0)) == (void *)-1) { + apr_file_close(file); return errno; } new_m->usable = new_m->base; if (shmctl(new_m->shmid, IPC_STAT, &shmbuf) == -1) { + apr_file_close(file); return errno; } apr_uid_current(&uid, &gid, pool); shmbuf.shm_perm.uid = uid; shmbuf.shm_perm.gid = gid; if (shmctl(new_m->shmid, IPC_SET, &shmbuf) == -1) { + apr_file_close(file); return errno; } @@ -341,6 +346,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, status = apr_file_write(file, (const void *)&reqsize, &nbytes); if (status != APR_SUCCESS) { + apr_file_close(file); return status; } status = apr_file_close(file); |