Malformed input support improved, fixes #394

koral-- · Apr 17, 2017 · 018b12f · 018b12f
1 parent 703d8a2
commit 018b12f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### 1.2.7-SNAPSHOT
 - `GifDrawable` subclassing simplified - [#399](https://github.com/koral--/android-gif-drawable/pull/399)
+- Malformed input support improved - [#394](https://github.com/koral--/android-gif-drawable/issues/394)
 - Android Support library updated to 25.3.1
 - Android gradle plugin updated to 2.3.1
 - Gradle wrapper regenerated with 3.5

diff --git a/android-gif-drawable/src/main/c/decoding.c b/android-gif-drawable/src/main/c/decoding.c
@@ -23,14 +23,14 @@ void DDGifSlurp(GifInfo *info, bool decode, bool exitAfterFrame) {
 	uint_fast32_t lastAllocatedGCBIndex = 0;
 	do {
 		if (DGifGetRecordType(gifFilePtr, &RecordType) == GIF_ERROR) {
-			return;
+			break;
 		}
 		bool isInitialPass = !decode && !exitAfterFrame;
 		switch (RecordType) {
 			case IMAGE_DESC_RECORD_TYPE:
 
 				if (DGifGetImageDesc(gifFilePtr, isInitialPass) == GIF_ERROR) {
-					return;
+					break;
 				}
 
 				if (isInitialPass) {
@@ -51,7 +51,7 @@ void DDGifSlurp(GifInfo *info, bool decode, bool exitAfterFrame) {
 						sp->ImageDesc.Left -= leftOverflow;
 					}
 					if (!updateGCB(info, &lastAllocatedGCBIndex)) {
-						return;
+						break;
 					}
 				}
 
@@ -63,7 +63,7 @@ void DDGifSlurp(GifInfo *info, bool decode, bool exitAfterFrame) {
 						void *tmpRasterBits = reallocarray(info->rasterBits, newRasterSize, sizeof(GifPixelType));
 						if (tmpRasterBits == NULL) {
 							gifFilePtr->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
-							return;
+							break;
 						}
 						info->rasterBits = tmpRasterBits;
 						info->rasterSize = newRasterSize;
@@ -80,11 +80,11 @@ void DDGifSlurp(GifInfo *info, bool decode, bool exitAfterFrame) {
 						for (i = 0; i < 4; i++)
 							for (j = InterlacedOffset[i]; j < gifFilePtr->Image.Height; j += InterlacedJumps[i]) {
 								if (DGifGetLine(gifFilePtr, info->rasterBits + j * gifFilePtr->Image.Width, gifFilePtr->Image.Width) == GIF_ERROR)
-									return;
+									break;
 							}
 					} else {
 						if (DGifGetLine(gifFilePtr, info->rasterBits, gifFilePtr->Image.Width * gifFilePtr->Image.Height) == GIF_ERROR) {
-							return;
+							break;
 						}
 					}
 
@@ -109,7 +109,7 @@ void DDGifSlurp(GifInfo *info, bool decode, bool exitAfterFrame) {
 				} else {
 					do {
 						if (DGifGetCodeNext(gifFilePtr, &ExtData) == GIF_ERROR) {
-							return;
+							break;
 						}
 					} while (ExtData != NULL);
 					if (exitAfterFrame) {
@@ -120,20 +120,20 @@ void DDGifSlurp(GifInfo *info, bool decode, bool exitAfterFrame) {
 
 			case EXTENSION_RECORD_TYPE:
 				if (DGifGetExtension(gifFilePtr, &ExtFunction, &ExtData) == GIF_ERROR) {
-					return;
+					break;
 				}
 				if (isInitialPass) {
 					updateGCB(info, &lastAllocatedGCBIndex);
 					if (readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) {
-						return;
+						break;
 					}
 				}
 				while (ExtData != NULL) {
 					if (DGifGetExtensionNext(gifFilePtr, &ExtData) == GIF_ERROR) {
-						return;
+						break;
 					}
 					if (isInitialPass && readExtensions(ExtFunction, ExtData, info) == GIF_ERROR) {
-						return;
+						break;
 					}
 				}
 				break;