Skip to content

Commit a95a021

Browse files
committed
- Fixed bug #54529 (SAPI crashes on apache_config.c:197)
patch by: hebergement at riastudio dot fr
1 parent a6acb1f commit a95a021

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

sapi/apache2handler/apache_config.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,12 @@ void apply_config(void *dummy)
192192
zend_hash_get_current_key_ex(&d->config, &str, &str_len, NULL, 0,
193193
NULL) == HASH_KEY_IS_STRING;
194194
zend_hash_move_forward(&d->config)) {
195-
zend_hash_get_current_data(&d->config, (void **) &data);
196-
phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
197-
if (zend_alter_ini_entry(str, str_len, data->value, data->value_len, data->status, data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE) == FAILURE) {
198-
phpapdebug((stderr, "..FAILED\n"));
199-
}
195+
if (zend_hash_get_current_data(&d->config, (void **) &data) == SUCCESS) {
196+
phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
197+
if (zend_alter_ini_entry(str, str_len, data->value, data->value_len, data->status, data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE) == FAILURE) {
198+
phpapdebug((stderr, "..FAILED\n"));
199+
}
200+
}
200201
}
201202
}
202203

0 commit comments

Comments
 (0)