Merge branch 'PHP-7.2' into PHP-7.3

nikic · nikic · commit a0163417efd8 · 2019-10-09T17:33:44.000+02:00
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
@@ -4571,8 +4571,9 @@ PHP_FUNCTION(exif_read_data)
 		exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "CCDWidth", "%dmm", (int)ImageInfo.CCDWidth);
 	}
 	if(ImageInfo.ExposureTime>0) {
-		if(ImageInfo.ExposureTime <= 0.5) {
-			exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s (1/%d)", ImageInfo.ExposureTime, (int)(0.5 + 1/ImageInfo.ExposureTime));
+		float recip_exposure_time = 0.5f + 1.0f/ImageInfo.ExposureTime;
+		if (ImageInfo.ExposureTime <= 0.5 && recip_exposure_time < INT_MAX) {
+			exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s (1/%d)", ImageInfo.ExposureTime, (int) recip_exposure_time);
 		} else {
 			exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s", ImageInfo.ExposureTime);
 		}

Original file line number	Diff line number	Diff line change
`@@ -4571,8 +4571,9 @@ PHP_FUNCTION(exif_read_data)`
`4571`	`4571`	`exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "CCDWidth", "%dmm", (int)ImageInfo.CCDWidth);`
`4572`	`4572`	`}`
`4573`	`4573`	`if(ImageInfo.ExposureTime>0) {`
`4574`		`- if(ImageInfo.ExposureTime <= 0.5) {`
`4575`		`- exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s (1/%d)", ImageInfo.ExposureTime, (int)(0.5 + 1/ImageInfo.ExposureTime));`
	`4574`	`+ float recip_exposure_time = 0.5f + 1.0f/ImageInfo.ExposureTime;`
	`4575`	`+ if (ImageInfo.ExposureTime <= 0.5 && recip_exposure_time < INT_MAX) {`
	`4576`	`+ exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s (1/%d)", ImageInfo.ExposureTime, (int) recip_exposure_time);`
`4576`	`4577`	`} else {`
`4577`	`4578`	`exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "ExposureTime", "%0.3F s", ImageInfo.ExposureTime);`
`4578`	`4579`	`}`