stas Fri Feb 16 18:29:40 2007 UTC Modified files: /php-src/ext/calendar calendar.c Log: use snprintf, increase hebdate buffer http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/calendar.c?r1=1.51&r2=1.52&diff_format=u Index: php-src/ext/calendar/calendar.c diff -u php-src/ext/calendar/calendar.c:1.51 php-src/ext/calendar/calendar.c:1.52 --- php-src/ext/calendar/calendar.c:1.51 Mon Jan 1 09:29:21 2007 +++ php-src/ext/calendar/calendar.c Fri Feb 16 18:29:40 2007 @@ -18,7 +18,7 @@ | Wez Furlong <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.51 2007/01/01 09:29:21 sebastian Exp $ */ +/* $Id: calendar.c,v 1.52 2007/02/16 18:29:40 stas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -416,7 +416,7 @@ calendar->from_jd(jd, &year, &month, &day); - sprintf(date, "%i/%i/%i", month, day, year); + snprintf(date, sizeof(date), "%i/%i/%i", month, day, year); add_assoc_string(return_value, "date", date, 1); add_assoc_long(return_value, "month", month); @@ -447,7 +447,7 @@ } SdnToGregorian(julday, &year, &month, &day); - sprintf(date, "%i/%i/%i", month, day, year); + snprintf(date, sizeof(date), "%i/%i/%i", month, day, year); RETURN_STRING(date, 1); } @@ -480,7 +480,7 @@ } SdnToJulian(julday, &year, &month, &day); - sprintf(date, "%i/%i/%i", month, day, year); + snprintf(date, sizeof(date), "%i/%i/%i", month, day, year); RETURN_STRING(date, 1); } @@ -602,7 +602,7 @@ long julday, fl = 0; zend_bool heb = 0; int year, month, day; - char date[16], hebdate[25]; + char date[16], hebdate[32]; char *dayp, *yearp; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|bl", &julday, &heb, &fl) == FAILURE) { @@ -611,7 +611,7 @@ SdnToJewish(julday, &year, &month, &day); if (!heb) { - sprintf(date, "%i/%i/%i", month, day, year); + snprintf(date, sizeof(date), "%i/%i/%i", month, day, year); RETURN_STRING(date, 1); } else { if (year <= 0 || year > 9999) { @@ -619,7 +619,7 @@ RETURN_FALSE; } - sprintf(hebdate, "%s %s %s", heb_number_to_chars(day, fl, &dayp), JewishMonthHebName[month], heb_number_to_chars(year, fl, &yearp)); + snprintf(hebdate, sizeof(hebdate), "%s %s %s", heb_number_to_chars(day, fl, &dayp), JewishMonthHebName[month], heb_number_to_chars(year, fl, &yearp)); if (dayp) { efree(dayp); @@ -661,7 +661,7 @@ } SdnToFrench(julday, &year, &month, &day); - sprintf(date, "%i/%i/%i", month, day, year); + snprintf(date, sizeof(date), "%i/%i/%i", month, day, year); RETURN_STRING(date, 1); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php