@@ -91,7 +91,6 @@ PHP_MINIT_FUNCTION(syslog)
91
91
/* AIX doesn't have LOG_PERROR */
92
92
REGISTER_LONG_CONSTANT ("LOG_PERROR" , LOG_PERROR , CONST_CS | CONST_PERSISTENT ); /*log to stderr*/
93
93
#endif
94
- BG (syslog_device )= NULL ;
95
94
96
95
return SUCCESS ;
97
96
}
@@ -108,16 +107,16 @@ PHP_RINIT_FUNCTION(syslog)
108
107
PHP_RSHUTDOWN_FUNCTION (syslog )
109
108
{
110
109
closelog ();
110
+ if (BG (syslog_device )) {
111
+ efree (BG (syslog_device ));
112
+ BG (syslog_device ) = NULL ;
113
+ }
111
114
return SUCCESS ;
112
115
}
113
116
#endif
114
117
115
118
PHP_MSHUTDOWN_FUNCTION (syslog )
116
119
{
117
- if (BG (syslog_device )) {
118
- free (BG (syslog_device ));
119
- BG (syslog_device ) = NULL ;
120
- }
121
120
return SUCCESS ;
122
121
}
123
122
@@ -147,9 +146,9 @@ PHP_FUNCTION(openlog)
147
146
ZEND_PARSE_PARAMETERS_END ();
148
147
149
148
if (BG (syslog_device )) {
150
- free (BG (syslog_device ));
149
+ efree (BG (syslog_device ));
151
150
}
152
- BG (syslog_device ) = zend_strndup (ident , ident_len );
151
+ BG (syslog_device ) = estrndup (ident , ident_len );
153
152
if (BG (syslog_device ) == NULL ) {
154
153
RETURN_FALSE ;
155
154
}
@@ -166,8 +165,8 @@ PHP_FUNCTION(closelog)
166
165
167
166
closelog ();
168
167
if (BG (syslog_device )) {
169
- free (BG (syslog_device ));
170
- BG (syslog_device )= NULL ;
168
+ efree (BG (syslog_device ));
169
+ BG (syslog_device ) = NULL ;
171
170
}
172
171
RETURN_TRUE ;
173
172
}
0 commit comments