avcodec/aacdec_template: Check decode_extension_payload() for failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years ago · ca3d8b471f
parent 8695fbec57
commit ca3d8b471f
1 changed files with 9 additions and 3 deletions
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@ -3246,9 +3246,15 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
                    err = AVERROR_INVALIDDATA;
                    goto fail;
            }
-            while (elem_id > 0)
-                elem_id -= decode_extension_payload(ac, gb, elem_id, che_prev, che_prev_type);
-            err = 0; /* FIXME */
+            err = 0;
+            while (elem_id > 0) {
+                int ret = decode_extension_payload(ac, gb, elem_id, che_prev, che_prev_type);
+                if (ret < 0) {
+                    err = ret;
+                    break;
+                }
+                elem_id -= ret;
+            }
            break;

        default: