archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
parameters.
This commit is contained in:
Ilia Alshanetsky 2006-01-02 22:19:37 +00:00
parent 6d8c69e3cb
commit a5e15f2e1c
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -3,6 +3,8 @@ PHP NEWS
?? Jan 2006, PHP 5.1.2RC2
- Added constants for libxslt and libexslt versions: LIBXSLT_VERSION,
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)
- Fixed segfault/leak in imagecolormatch(). (Pierre)
- Fixed small leak in mysqli_stmt_fetch() when bound variable was empty string.

10
sapi/apache2handler/php_functions.c
View file

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