php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in standard syslog device handling

Browse Source 
The BG(syslog_device) is leaked in RINIT.

Closes GH-12501
This commit is contained in:
Daniil Gentili
2023-10-23 21:36:01 +02:00
committed by Jakub Zelenka
parent 55dfc29539
commit 10b2b4a52c
4 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -2,7 +2,8 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.1.27
- Standard:
. Fix memory leak in syslog device handling. (danog)
23 Nov 2023, PHP 8.1.26

10
ext/standard/basic_functions.c
View File

@@ -427,9 +427,6 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
{
#ifdef HAVE_SYSLOG_H
PHP_MSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
#ifdef ZTS
ts_free_id(basic_globals_id);
#ifdef PHP_WIN32
@@ -487,9 +484,6 @@ PHP_RINIT_FUNCTION(basic) /* {{{ */
BG(user_shutdown_function_names) = NULL;
PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
BASIC_RINIT_SUBMODULE(syslog)
#endif
BASIC_RINIT_SUBMODULE(dir)
BASIC_RINIT_SUBMODULE(url_scanner_ex)
@@ -541,9 +535,7 @@ PHP_RSHUTDOWN_FUNCTION(basic) /* {{{ */
PHP_RSHUTDOWN(filestat)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
#ifdef PHP_WIN32
BASIC_RSHUTDOWN_SUBMODULE(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
BASIC_RSHUTDOWN_SUBMODULE(syslog);
#endif
BASIC_RSHUTDOWN_SUBMODULE(assert)
BASIC_RSHUTDOWN_SUBMODULE(url_scanner_ex)

4
ext/standard/php_ext_syslog.h
View File

@@ -22,11 +22,7 @@
#include "php_syslog.h"
PHP_MINIT_FUNCTION(syslog);
PHP_RINIT_FUNCTION(syslog);
#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog);
#endif
PHP_MSHUTDOWN_FUNCTION(syslog);
#endif

16
ext/standard/syslog.c
View File

@@ -96,23 +96,9 @@ PHP_MINIT_FUNCTION(syslog)
}
/* }}} */
PHP_RINIT_FUNCTION(syslog)
{
BG(syslog_device) = NULL;
return SUCCESS;
}
#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog)
{
closelog();
return SUCCESS;
}
#endif
PHP_MSHUTDOWN_FUNCTION(syslog)
{
php_closelog();
if (BG(syslog_device)) {
free(BG(syslog_device));
BG(syslog_device) = NULL;