Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Fixed bug #29333 (output_buffering + trans_sess_id can corrupt output).

PHP-5.1
Ilia Alshanetsky 22 years ago
parent
b5a926f78d
commit
70d78cf7dd
2 changed files with 40 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      ext/standard/url_scanner_ex.c
  2. 25
      ext/standard/url_scanner_ex.re

25
ext/standard/url_scanner_ex.c
View File

@ -987,16 +987,31 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char *
{ {
size_t len; size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
*handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & (PHP_OUTPUT_HANDLER_END|PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC);
if (BG(url_adapt_state_ex).url_app.len != 0) {
*handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & PHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) < sizeof(size_t)) { if (sizeof(uint) < sizeof(size_t)) {
if (len > UINT_MAX) if (len > UINT_MAX)
len = UINT_MAX; len = UINT_MAX;
} }
*handled_output_len = len; *handled_output_len = len;
} else {
*handled_output = NULL;
}
} else if (BG(url_adapt_state_ex).url_app.len == 0) {
url_adapt_state_ex_t *ctx = &BG(url_adapt_state_ex);
if (ctx->buf.len) {
smart_str_appendl(&ctx->result, ctx->buf.c, ctx->buf.len);
smart_str_appendl(&ctx->result, output, output_len);
*handled_output = ctx->result.c;
*handled_output_len = ctx->buf.len + output_len;
ctx->result.c = NULL;
ctx->result.len = 0;
smart_str_free(&ctx->buf);
} else {
*handled_output = NULL;
}
} else {
*handled_output = NULL;
}
} }
int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC) int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)

25
ext/standard/url_scanner_ex.re
View File

@ -416,16 +416,31 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char *
{ {
size_t len; size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
*handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & (PHP_OUTPUT_HANDLER_END|PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC);
if (BG(url_adapt_state_ex).url_app.len != 0) {
*handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode & PHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) < sizeof(size_t)) { if (sizeof(uint) < sizeof(size_t)) {
if (len > UINT_MAX) if (len > UINT_MAX)
len = UINT_MAX; len = UINT_MAX;
} }
*handled_output_len = len; *handled_output_len = len;
} else {
*handled_output = NULL;
}
} else if (BG(url_adapt_state_ex).url_app.len == 0) {
url_adapt_state_ex_t *ctx = &BG(url_adapt_state_ex);
if (ctx->buf.len) {
smart_str_appendl(&ctx->result, ctx->buf.c, ctx->buf.len);
smart_str_appendl(&ctx->result, output, output_len);
*handled_output = ctx->result.c;
*handled_output_len = ctx->buf.len + output_len;
ctx->result.c = NULL;
ctx->result.len = 0;
smart_str_free(&ctx->buf);
} else {
*handled_output = NULL;
}
} else {
*handled_output = NULL;
}
} }
int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC) int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)

Write Preview
Loading…
Cancel
Save