fix NULL deref

weltling · weltling · commit ce1a0d971b01 · 2017-08-01T11:55:32.000+02:00
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -1973,11 +1973,11 @@ static void exif_error_docref(const char *docref EXIFERR_DC, const image_info_ty`
`1973`	`1973`	`char *buf;`
`1974`	`1974`
`1975`	`1975`	`spprintf(&buf, 0, "%s(%d): %s", _file, _line, format);`
`1976`		`- php_verror(docref, ImageInfo->FileName?ImageInfo->FileName:"", type, buf, args);`
	`1976`	`+ php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, buf, args);`
`1977`	`1977`	`efree(buf);`
`1978`	`1978`	`}`
`1979`	`1979`	`#else`
`1980`		`- php_verror(docref, ImageInfo->FileName?ImageInfo->FileName:"", type, format, args);`
	`1980`	`+ php_verror(docref, ImageInfo && ImageInfo->FileName ? ImageInfo->FileName:"", type, format, args);`
`1981`	`1981`	`#endif`
`1982`	`1982`	`va_end(args);`
`1983`	`1983`	`}`