mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Fixed possible crash in apache_getenv()/apache_setenv() on invalid
parameters.
This commit is contained in:
parent
6d8c69e3cb
commit
a5e15f2e1c
2 changed files with 16 additions and 8 deletions
2
NEWS
2
NEWS
|
@ -3,6 +3,8 @@ PHP NEWS
|
||||||
?? Jan 2006, PHP 5.1.2RC2
|
?? Jan 2006, PHP 5.1.2RC2
|
||||||
- Added constants for libxslt and libexslt versions: LIBXSLT_VERSION,
|
- Added constants for libxslt and libexslt versions: LIBXSLT_VERSION,
|
||||||
LIBXSLT_DOTTED_VERSION, LIBEXSLT_VERSION and LIBEXSLT_DOTTED_VERSION. (Pierre)
|
LIBXSLT_DOTTED_VERSION, LIBEXSLT_VERSION and LIBEXSLT_DOTTED_VERSION. (Pierre)
|
||||||
|
- Fixed possible crash in apache_getenv()/apache_setenv() on invalid parameters.
|
||||||
|
(Ilia)
|
||||||
- Changed errors to warnings in imagecolormatch(). (Pierre)
|
- Changed errors to warnings in imagecolormatch(). (Pierre)
|
||||||
- Fixed segfault/leak in imagecolormatch(). (Pierre)
|
- Fixed segfault/leak in imagecolormatch(). (Pierre)
|
||||||
- Fixed small leak in mysqli_stmt_fetch() when bound variable was empty string.
|
- Fixed small leak in mysqli_stmt_fetch() when bound variable was empty string.
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue