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

m6w6 · m6w6 · commit 1056c57fa989 · 2011-05-24T05:06:53.000Z
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ static void php_url_scanner_output_handler(char output, uint output_len, char `
`450`	`450`	`ctx->result.len = 0;`
`451`	`451`	`smart_str_free(&ctx->buf);`
`452`	`452`	`} else {`
`453`		`- *handled_output = NULL;`
	`453`	`+ handled_output = estrndup(output, handled_output_len = output_len);`
`454`	`454`	`}`
`455`	`455`	`} else {`
`456`	`456`	`*handled_output = NULL;`