com php-src: Fixed merge: ext/standard/formatted_print.c
| From: | Xinchen Hui | Date: | Sun, 01 Jun 2014 15:14:31 +0000 |
| Subject: | com php-src: Fixed merge: ext/standard/formatted_print.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78657@lists.php.net to get a copy of this message | ||
Commit: 717b5661e7180053629658a90d7946e09c2fe2c8
Author: Xinchen Hui <laruence@php.net> Sun, 1 Jun 2014 23:14:31 +0800
Parents: 91b2ddc8160d90c2e6db126f9733c6f543584d66
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=717b5661e7180053629658a90d7946e09c2fe2c8
Log:
Fixed merge
Changed paths:
M ext/standard/formatted_print.c
Diff:
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 6c1f157..aa83b30 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -414,6 +414,7 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC)
}
format = Z_STRVAL(args[format_offset]);
+ format_len = Z_STRLEN(args[format_offset]);
result = STR_ALLOC(size, 0);
currarg = 1;