Re: com php-src: sapi/litespeed/lsapi_main.c: Fix bug #63228: sapi/litespeed/lsapi_main.c

On Thu, May 1, 2014 at 1:36 PM, Felipe Pena <felipensp@gmail.com> wrote: > On Thu, May 1, 2014 at 5:07 AM, Ferenc Kovacs <tyra3l@gmail.com> wrote: > > > > > > > > On Tue, Apr 22, 2014 at 3:48 PM, Felipe Pena <felipe@php.net> wrote: > >> > >> Commit: 742f4704a97844654bde3f9f054e6678ef897a1a > >> Author: George Wang <gwang@php.net> Fri, 12 Oct 2012 > 13:04:22 > >> -0400 > >> Committer: Felipe Pena <felipensp@gmail.com> Tue, 22 Apr 2014 > >> 10:48:14 -0300 > >> Parents: 4784d99866346d49d19027ebd955775a7279e248 > >> Branches: PHP-5.6 master > >> > >> Link: > >> > > http://git.php.net/?p=php-src.git;a=commitdiff;h=742f4704a97844654bde3f9f054e6678ef897a1a
¦Ùˆ¢Ú[ > &ñ8о > >> > >> Log: > >> sapi/litespeed/lsapi_main.c: Fix bug #63228 > >> > >> Fix compiling error at line 606 (error: format not a string > >> literal and no format arguments [-Werror=format-security] > >> > >> Bugs: > >> https://bugs.php.net/63228 > >> > >> Changed paths: > >> M sapi/litespeed/lsapi_main.c > >> > >> > >> Diff: > >> diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c > >> index 33ebb98..34ae751 100644 > >> --- a/sapi/litespeed/lsapi_main.c > >> +++ b/sapi/litespeed/lsapi_main.c > >> @@ -615,7 +615,7 @@ static void cli_usage( TSRMLS_D ) > >> " args... Arguments passed to script.\n"; > >> php_output_startup(); > >> php_output_activate(TSRMLS_C); > >> - php_printf( usage ); > >> + php_printf( "%s", usage ); > >> #ifdef PHP_OUTPUT_NEWAPI > >> php_output_end_all(TSRMLS_C); > >> #else > >> > >> > >> -- > >> PHP CVS Mailing List (http://www.php.net/) > >> To unsubscribe, visit: http://www.php.net/unsub.php > >> > > > > this is missing the NEWS entry. > > > > -- > > Ferenc Kovács > > @Tyr43l - http://tyrael.hu > > I just merged an old fix to 5.6 and master. > > yes, but it is still a "new" fix in 5.6, so a NEWS entry is reasonable. I've added it already btw. and thanks for taking care of this! -- Ferenc Kovács @Tyr43l - http://tyrael.hu