diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-02 16:27:43 +0100 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-02 20:03:57 +0100 |
| commit | 2e752c7de9df236ee4e3f36ae6c0b0308c7bc308 (patch) | |
| tree | dd833d3a6c6b75b85190c1dbcbe77920e6365189 | |
| parent | cccb0ffccc3723acc7aab3a859b24743596dd9c0 (diff) | |
| download | ffmpeg-2e752c7de9df236ee4e3f36ae6c0b0308c7bc308.tar.gz | |
ffmdec: change type of state and id to unsigned
This fixes ubsan runtime error: left shift by 8 places cannot be
represented in type 'int'
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavformat/ffmdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 9fe41556f1..7f31d14445 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -68,7 +68,7 @@ static int ffm_is_avail_data(AVFormatContext *s, int size) return AVERROR_INVALIDDATA; } -static int ffm_resync(AVFormatContext *s, int state) +static int ffm_resync(AVFormatContext *s, uint32_t state) { av_log(s, AV_LOG_ERROR, "resyncing\n"); while (state != PACKET_ID) { @@ -87,7 +87,8 @@ static int ffm_read_data(AVFormatContext *s, { FFMContext *ffm = s->priv_data; AVIOContext *pb = s->pb; - int len, fill_size, size1, frame_offset, id; + int len, fill_size, size1, frame_offset; + uint32_t id; int64_t last_pos = -1; size1 = size; |