commit 748dbd7dfcecb19f3a19caaba4285e059f32d2dd
author Nick Chusid Mon Jan 27 22:10:56 2025 +0000
committer Android Build Coastguard Worker Wed Feb 05 21:18:24 2025 -0800
tree d2984f1e0ea97539dcafc6dae96aed4c1eaada18
parent 8d8c9effa2a9c1801650a8069ab8644c988c6545

Fail fast in dng sdk if an invalid tag count is seen

Bug: 346797131
Test: TreeHugger
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:84b0c687ce847c80a2454b206c046da8241db41b)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b71b6d16edf84b31e42eefb147cddafdf0464356)
Merged-In: I76da86b063ce4a0a329aca2a1309997cd62ac58d
Change-Id: I76da86b063ce4a0a329aca2a1309997cd62ac58d

source/dng_ifd.cpp

diff --git a/source/dng_ifd.cpp b/source/dng_ifd.cpp
index 7f22065..bf3fb2c 100644
--- a/source/dng_ifd.cpp
+++ b/source/dng_ifd.cpp
@@ -351,7 +351,8 @@
 			
 			CheckTagType (parentCode, tagCode, tagType, ttShort);
 			
-			CheckTagCount (parentCode, tagCode, tagCount, 1, 0x0FFFF);
+			if (!CheckTagCount (parentCode, tagCode, tagCount, 1, 0x0FFFF))
+				return false;
 			
 			#if qDNGValidate
 			
@@ -973,7 +974,8 @@
 			
 			CheckTagType (parentCode, tagCode, tagType, ttShort);
 			
-			CheckTagCount (parentCode, tagCode, tagCount, 1, fSamplesPerPixel);
+			if (!CheckTagCount (parentCode, tagCode, tagCount, 1, fSamplesPerPixel))
+				return false;
 			
 			#if qDNGValidate
 			
@@ -1025,7 +1027,8 @@
 			
 			CheckTagType (parentCode, tagCode, tagType, ttShort);
 			
-			CheckTagCount (parentCode, tagCode, tagCount, fSamplesPerPixel);
+			if (!CheckTagCount (parentCode, tagCode, tagCount, fSamplesPerPixel))
+				return false;
 			
 			#if qDNGValidate