Check available size before writing in decode_frame()

[ffmpeg] / libavcodec / aac_parser.c

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index ddf82819be5f1c96e0fe705470c596643b9d84c4..db2c697725d6edcd5799032c16edb789b37f82c0 100644 (file)
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -34,7 +34,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
     int size, rdb, ch, sr;
     uint64_t tmp = be2me_64(state);
 
-    init_get_bits(&bits, (uint8_t *)&tmp, AAC_HEADER_SIZE * 8);
+    init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);
 
     if(get_bits(&bits, 12) != 0xfff)
         return 0;
@@ -68,8 +68,8 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
     hdr_info->samples = (rdb + 1) * 1024;
     hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples;
 
-    *need_next_header=0;
-    *new_frame_start=1;
+    *need_next_header = 0;
+    *new_frame_start  = 1;
     return size;
 }