clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 04:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed crash in file_error_core()

Browse Source
This commit is contained in:
Felipe Pena 2008-08-27 00:16:11 +00:00
parent 778f5295ba
commit 4eaaf7be83
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ext/fileinfo/libmagic/funcs.c
View File

@ -52,7 +52,6 @@ protected int
file_printf(struct magic_set *ms, const char *fmt, ...)
{
va_list ap;
size_t size;
int len;
char *buf = NULL, *newstr;
@ -81,17 +80,32 @@ private void
file_error_core(struct magic_set *ms, int error, const char *f, va_list va,
uint32_t lineno)
{
char *buf = NULL;
/* Only the first error is ok */
if (ms->haderr)
if (ms->haderr) {
return;
}
if (lineno != 0) {
efree(ms->o.buf);
ms->o.buf = NULL;
file_printf(ms, "line %u: ", lineno);
}
file_printf(ms, f, va);
if (error > 0)
file_printf(ms, " (%s)", strerror(error));
vspprintf(&buf, 0, f, va);
va_end(va);
if (error > 0) {
file_printf(ms, "%s (%s)", (*buf ? buf : ""), strerror(error));
} else if (*buf) {
file_printf(ms, "%s", buf);
}
if (buf) {
efree(buf);
}
ms->haderr++;
ms->error = error;
}