summaryrefslogtreecommitdiff
path: root/ext/exif
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-08-01 11:55:32 +0200
committerAnatol Belski <ab@php.net>2017-08-01 11:55:32 +0200
commitce1a0d971b018c0adf28095d86aea6776b5188a1 (patch)
treed4040b0c8bd9cf607050933146243f2600bcb037 /ext/exif
parent5856becc2b9bcffcbfd09a913821dda37c1af5f9 (diff)
downloadphp-git-ce1a0d971b018c0adf28095d86aea6776b5188a1.tar.gz
fix NULL deref
Diffstat (limited to 'ext/exif')
-rw-r--r--ext/exif/exif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index adfb539b37..306b94dbe2 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1973,11 +1973,11 @@ static void exif_error_docref(const char *docref EXIFERR_DC, const image_info_ty
char *buf;
spprintf(&buf, 0, "%s(%d): %s", _file, _line, format);
- php_verror(docref, ImageInfo->FileName?ImageInfo->FileName:"", type, buf, args);
+ php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, buf, args);
efree(buf);
}
#else
- php_verror(docref, ImageInfo->FileName?ImageInfo->FileName:"", type, format, args);
+ php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, format, args);
#endif
va_end(args);
}