archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  updated NEWS
  Fixed bug #68671 incorrect expression in libmagic

Conflicts:
	ext/fileinfo/libmagic/print.c
This commit is contained in:
Anatol Belski 2014-12-30 19:41:07 +01:00
commit a78eaddbe0
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/fileinfo/libmagic/print.c
View file

@ -59,15 +59,18 @@ protected void
file_magwarn(struct magic_set *ms, const char *f, ...) file_magwarn(struct magic_set *ms, const char *f, ...)
{ {
va_list va; va_list va;
char *expanded_format; char *expanded_format = NULL;
int expanded_len;
va_start(va, f); va_start(va, f);
if (vasprintf(&expanded_format, f, va)); /* silence */ expanded_len = vasprintf(&expanded_format, f, va);
va_end(va); va_end(va);
if (expanded_len >= 0 && expanded_format) {
php_error_docref(NULL, E_NOTICE, "Warning: %s", expanded_format); php_error_docref(NULL, E_NOTICE, "Warning: %s", expanded_format);
free(expanded_format); free(expanded_format);
}
} }
protected const char * protected const char *