Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:42:59 +0000 (04:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:43:41 +0000 (04:43 +0100)
* commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b':
  mpegts: check get16() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mpegts.c

index 74ae4fafe44bb73e50336cf8fd7e1437720b3f30,1377d9ceb4bfc57d7197de4997db4bb789c3b640..f7f484e133fdc08ec6d37a213650035d59fede0a
@@@ -1573,9 -1363,10 +1575,10 @@@ int ff_parse_mpeg2_descriptor(AVFormatC
              }
          break;
      case 0x1F: /* FMC descriptor */
-         get16(pp, desc_end);
+         if (get16(pp, desc_end) < 0)
+             break;
          if (mp4_descr_count > 0 &&
 -            st->codec->codec_id == AV_CODEC_ID_AAC_LATM &&
 +            (st->codec->codec_id == AV_CODEC_ID_AAC_LATM || st->request_probe > 0) &&
              mp4_descr->dec_config_descr_len && mp4_descr->es_id == pid) {
              AVIOContext pb;
              ffio_init_context(&pb, mp4_descr->dec_config_descr,