IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-19 05:33:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

*) fix memory leak in successful case

Browse Source 
*) log shared memory name in failure case
This commit is contained in:
Igor Sysoev 2009-06-02 13:56:42 +00:00
parent 785ee23467
commit 5b26bec9e8
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/os/win32/ngx_shmem.c
View File

@ -19,7 +19,7 @@ ngx_shm_alloc(ngx_shm_t *shm)
return NGX_ERROR;
}
ngx_sprintf(name, "%V_%s%Z", &shm->name, ngx_unique);
(void) ngx_sprintf(name, "%V_%s%Z", &shm->name, ngx_unique);
ngx_set_errno(0);
@ -33,10 +33,14 @@ ngx_shm_alloc(ngx_shm_t *shm)
if (shm->handle == NULL) {
ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
"CreateFileMapping(%uz, %s) failed",
shm->size, shm->name.data);
goto failed;
shm->size, name);
ngx_free(name);
return NGX_ERROR;
}
ngx_free(name);
if (ngx_errno == ERROR_ALREADY_EXISTS) {
shm->exists = 1;
}
@ -48,17 +52,15 @@ ngx_shm_alloc(ngx_shm_t *shm)
}
ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
"MapViewOfFile(%uz) failed", shm->size);
"MapViewOfFile(%uz) of file mapping \"%V\" failed",
shm->size, &shm->name);
if (CloseHandle(shm->handle) == 0) {
ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
"CloseHandle() failed");
"CloseHandle() of file mapping \"%V\" failed",
&shm->name);
}
failed:
ngx_free(name);
return NGX_ERROR;
}
@ -68,11 +70,13 @@ ngx_shm_free(ngx_shm_t *shm)
{
if (UnmapViewOfFile(shm->addr) == 0) {
ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
"UnmapViewOfFile(%p) failed", shm->addr);
"UnmapViewOfFile(%p) of file mapping \"%V\" failed",
shm->addr, &shm->name);
}
if (CloseHandle(shm->handle) == 0) {
ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
"CloseHandle() failed");
"CloseHandle() of file mapping \"%V\" failed",
&shm->name);
}
}