MFB51: Fixed possible crash in apache_getenv()/apache_setenv() on invalid

parameters.
This commit is contained in:
Ilia Alshanetsky 2006-01-02 22:19:53 +00:00
parent 61d12ef9ec
commit 331253e7e6

View file

@ -264,10 +264,13 @@ PHP_FUNCTION(apache_setenv)
ctx = SG(server_context); ctx = SG(server_context);
r = ctx->r; r = ctx->r;
if (arg_count == 3 && Z_STRVAL_PP(walk_to_top)) { if (arg_count == 3) {
while(r->prev) { convert_to_boolean_ex(walk_to_top);
r = r->prev; if (Z_LVAL_PP(walk_to_top)) {
} while(r->prev) {
r = r->prev;
}
}
} }
convert_to_string_ex(variable); convert_to_string_ex(variable);
@ -300,10 +303,13 @@ PHP_FUNCTION(apache_getenv)
ctx = SG(server_context); ctx = SG(server_context);
r = ctx->r; r = ctx->r;
if (arg_count == 2 && Z_STRVAL_PP(walk_to_top)) { if (arg_count == 2) {
while(r->prev) { convert_to_boolean_ex(walk_to_top);
r = r->prev; if (Z_LVAL_PP(walk_to_top)) {
} while(r->prev) {
r = r->prev;
}
}
} }
convert_to_string_ex(variable); convert_to_string_ex(variable);