clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #68671 incorrect expression in libmagic

Browse Source
This commit is contained in:
Anatol Belski 2014-12-30 19:37:27 +01:00
parent 211f4ceeae
commit d92a87d7cb
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -25,6 +25,10 @@ PHP NEWS
. Fixed bug #67643 (curl_multi_getcontent returns '' when
CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)
- Fileinfo:
. Fixed bug #68671 (incorrect expression in libmagic).
(Joshua Rogers, Anatol Belski)
- GD:
. Fixed bug #68601 (buffer read overflow in gd_gif_in.c). (Jan Bee, Remi)

11
ext/fileinfo/libmagic/print.c
View File

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