mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added ngx_init_setproctitle() return code check.

Browse Source 
The ngx_init_setproctitle() function, as used on systems without
setproctitle(3), may fail due to memory allocation errors, and
therefore its return code needs to be checked.

Reported by Markus Linnala.
This commit is contained in:
Maxim Dounin 2014-09-08 21:36:09 +04:00
parent 90df702bf8
commit cb8a0327ab
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/unix/ngx_posix_init.c
View File

@ -40,7 +40,9 @@ ngx_os_init(ngx_log_t *log)
} }
#endif #endif
ngx_init_setproctitle(log); if (ngx_init_setproctitle(log) != NGX_OK) {
return NGX_ERROR;
}
ngx_pagesize = getpagesize(); ngx_pagesize = getpagesize();
ngx_cacheline_size = NGX_CPU_CACHE_LINE; ngx_cacheline_size = NGX_CPU_CACHE_LINE;

4
src/os/unix/ngx_setproctitle.h
View File

@ -13,7 +13,7 @@
/* FreeBSD, NetBSD, OpenBSD */ /* FreeBSD, NetBSD, OpenBSD */
#define ngx_init_setproctitle(log) #define ngx_init_setproctitle(log) NGX_OK
#define ngx_setproctitle(title) setproctitle("%s", title) #define ngx_setproctitle(title) setproctitle("%s", title)
@ -39,7 +39,7 @@ void ngx_setproctitle(char *title);
#else #else
#define ngx_init_setproctitle(log) #define ngx_init_setproctitle(log) NGX_OK
#define ngx_setproctitle(title) #define ngx_setproctitle(title)
#endif /* OSes */ #endif /* OSes */