Reset generic animation type to BM_TYPE_NONE if APNG processing fails. #1363
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prior to APNG support, a regular non-animated PNG could be used as a still-frame command briefing animation. This started causing a crash when APNG support was added because any PNGs sent through generic_anim_stream() would get ga->type set to BM_TYPE_PNG, then sent through the APNG code... which would determine that they weren't APNGs, throw an ApngException, and generic_anim_stream() would return -1... except that BM_TYPE_PNG would still be set, so that when it later came time to render the still frame in generic_frame_render(), it would be sent through generic_anim_render_variable_frame_delay()... which expected a fully-formed APNG, tried to dereference ga->png.anim, and crashed. This commit is a simple fix to reset ga->type to BM_TYPE_NONE if APNG processing fails, allowing the still-frame PNG to go through generic_anim_render_fixed_frame_delay(), the code path it used to take, and allowing it to display properly instead of crashing.
MageKing17
added
fix
asarium
approved these changes
Jun 4, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prior to APNG support, a regular non-animated PNG could be used as a still-frame command briefing animation. This started causing a crash when APNG support was added because any PNGs sent through
generic_anim_stream()would getga->typeset toBM_TYPE_PNG, then sent through the APNG code... which would determine that they weren't APNGs, throw anApngException, andgeneric_anim_stream()would return -1... except thatBM_TYPE_PNGwould still be set, so that when it later came time to render the still frame ingeneric_frame_render(), it would be sent throughgeneric_anim_render_variable_frame_delay()... which expected a fully-formed APNG, tried to dereferencega->png.anim, and crashed.This commit is a simple fix to reset
ga->typetoBM_TYPE_NONEif APNG processing fails, allowing the still-frame PNG to go throughgeneric_anim_render_fixed_frame_delay(), the code path it used to take, and allowing it to display properly instead of crashing.A more complicated solution might be to change how still frames get processed entirely.