embedaddon/php/main/spprintf.c - diff

Return to spprintf.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / main

Diff for /embedaddon/php/main/spprintf.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:48:05	version 1.1.1.2, 2012/05/29 12:34:35
Line 123	Line 123
* NDIG = 320	* NDIG = 320
* NUM_BUF_SIZE >= strlen("-") + Emax + strlrn(".") + NDIG + strlen("E+1023") + 1;	* NUM_BUF_SIZE >= strlen("-") + Emax + strlrn(".") + NDIG + strlen("E+1023") + 1;
*/	*/
#define NUM_BUF_SIZE 2048	#define NUM_BUF_SIZE 2048

/*	/*
* The INS_CHAR macro inserts a character in the buffer.	* The INS_CHAR macro inserts a character in the buffer.
Line 390 static void xbuf_format_converter(smart_str *xbuf, con	Line 390 static void xbuf_format_converter(smart_str *xbuf, con
*/	*/
switch (*fmt) {	switch (*fmt) {
case 'Z':	case 'Z':
#if SUHOSIN_PATCH
zend_suhosin_log(S_MISC, "'Z' specifier within format string");
goto skip_output;
#else
zvp = (zval) va_arg(ap, zval);	zvp = (zval) va_arg(ap, zval);
zend_make_printable_zval(zvp, &zcopy, &free_zcopy);	zend_make_printable_zval(zvp, &zcopy, &free_zcopy);
if (free_zcopy) {	if (free_zcopy) {
Line 404 static void xbuf_format_converter(smart_str *xbuf, con	Line 400 static void xbuf_format_converter(smart_str *xbuf, con
if (adjust_precision && precision < s_len) {	if (adjust_precision && precision < s_len) {
s_len = precision;	s_len = precision;
}	}
#endif
break;	break;
case 'u':	case 'u':
switch(modifier) {	switch(modifier) {
Line 705 static void xbuf_format_converter(smart_str *xbuf, con	Line 700 static void xbuf_format_converter(smart_str *xbuf, con


case 'n':	case 'n':
#if SUHOSIN_PATCH
zend_suhosin_log(S_MISC, "'n' specifier within format string");
#else
(va_arg(ap, int )) = xbuf->len;	(va_arg(ap, int )) = xbuf->len;
#endif
goto skip_output;	goto skip_output;

/*	/*

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2