From: Michael Wallner <mike@php.net>
Date: Mon, 23 May 2011 10:42:00 +0000 (+0000)
Subject: Fix Bug #54727, a re-incarnation of #26862
X-Git-Tag: php-5.5.0alpha1~2054
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=327a87fdd9e7946d31d9f3176e8f3dac5449e7a3;p=php

Fix Bug #54727, a re-incarnation of #26862
---

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 0618138f15..f9c017ff93 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon May 31 11:07:50 2010 */
+/* Generated by re2c 0.13.5 on Mon May 23 12:29:55 2011 */
 #line 1 "ext/standard/url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+
@@ -1012,7 +1012,7 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char *
 			ctx->result.len = 0;
 			smart_str_free(&ctx->buf);
 		} else {
-			*handled_output = NULL;
+			*handled_output = estrndup(output, *handled_output_len = output_len);
 		}
 	} else {
 		*handled_output = NULL;
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 5cc16c7ece..7994925b1c 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -450,7 +450,7 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char *
 			ctx->result.len = 0;
 			smart_str_free(&ctx->buf);
 		} else {
-			*handled_output = NULL;
+			*handled_output = estrndup(output, *handled_output_len = output_len);
 		}
 	} else {
 		*handled_output = NULL;