From: Xinchen Hui <laruence@php.net>
Date: Sun, 1 Jun 2014 15:14:31 +0000 (+0800)
Subject: Fixed merge
X-Git-Tag: POST_PHPNG_MERGE~233
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=717b5661e7180053629658a90d7946e09c2fe2c8;p=php

Fixed merge
---

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 6c1f157cec..aa83b30c45 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;