--- embedaddon/php/main/spprintf.c 2012/05/29 12:34:35 1.1.1.2 +++ embedaddon/php/main/spprintf.c 2013/07/22 01:32:11 1.1.1.3 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2013 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spprintf.c,v 1.1.1.2 2012/05/29 12:34:35 misho Exp $ */ +/* $Id: spprintf.c,v 1.1.1.3 2013/07/22 01:32:11 misho Exp $ */ /* This is the spprintf implementation. * It has emerged from apache snprintf. See original header: @@ -211,7 +211,7 @@ static void xbuf_format_converter(smart_str *xbuf, con double fp_num; wide_int i_num = (wide_int) 0; - u_wide_int ui_num; + u_wide_int ui_num = (u_wide_int) 0; char num_buf[NUM_BUF_SIZE]; char char_buf[2]; /* for printing %% and % */ @@ -560,7 +560,7 @@ static void xbuf_format_converter(smart_str *xbuf, con s = ap_php_conv_p2(ui_num, 4, *fmt, &num_buf[NUM_BUF_SIZE], &s_len); FIX_PRECISION(adjust_precision, precision, s, s_len); - if (alternate_form && i_num != 0) { + if (alternate_form && ui_num != 0) { *--s = *fmt; /* 'x' or 'X' */ *--s = '0'; s_len += 2;