| Message ID | 20200814230744.20319-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | e8a88a16f78e66c8d7645b5f71dc8390b033fa70 |
| Headers | show |
| Series | [FFmpeg-devel] avformat/mpeg: Check avio_read() return value in get_pts() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Fri, Aug 14, 2020, 4:08 PM Michael Niedermayer <michael@niedermayer.cc> wrote: > Found-by: Thierry Foucu <tfoucu@gmail.com> > Fixes: Use-of-uninitialized-value > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/mpeg.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c > index 265b2bd1ad..a5e17925ce 100644 > --- a/libavformat/mpeg.c > +++ b/libavformat/mpeg.c > @@ -147,9 +147,12 @@ static int mpegps_read_header(AVFormatContext *s) > static int64_t get_pts(AVIOContext *pb, int c) > { > uint8_t buf[5]; > + int ret; > > buf[0] = c < 0 ? avio_r8(pb) : c; > - avio_read(pb, buf + 1, 4); > + ret = avio_read(pb, buf + 1, 4); > + if (ret < 4) > + return AV_NOPTS_VALUE; > > return ff_parse_pes_pts(buf); > } > -- > 2.17.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". Thanks. I though also about this solution. This works as well.
On Fri, Aug 14, 2020 at 04:50:02PM -0700, Thierry Foucu wrote: > On Fri, Aug 14, 2020, 4:08 PM Michael Niedermayer <michael@niedermayer.cc> > wrote: > > > Found-by: Thierry Foucu <tfoucu@gmail.com> > > Fixes: Use-of-uninitialized-value > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavformat/mpeg.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c > > index 265b2bd1ad..a5e17925ce 100644 > > --- a/libavformat/mpeg.c > > +++ b/libavformat/mpeg.c > > @@ -147,9 +147,12 @@ static int mpegps_read_header(AVFormatContext *s) > > static int64_t get_pts(AVIOContext *pb, int c) > > { > > uint8_t buf[5]; > > + int ret; > > > > buf[0] = c < 0 ? avio_r8(pb) : c; > > - avio_read(pb, buf + 1, 4); > > + ret = avio_read(pb, buf + 1, 4); > > + if (ret < 4) > > + return AV_NOPTS_VALUE; > > > > return ff_parse_pes_pts(buf); > > } > > -- > > 2.17.1 > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > To unsubscribe, visit link above, or email > > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > > > > > > Thanks. > > I though also about this solution. This works as well. will apply thx [...]
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 265b2bd1ad..a5e17925ce 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -147,9 +147,12 @@ static int mpegps_read_header(AVFormatContext *s) static int64_t get_pts(AVIOContext *pb, int c) { uint8_t buf[5]; + int ret; buf[0] = c < 0 ? avio_r8(pb) : c; - avio_read(pb, buf + 1, 4); + ret = avio_read(pb, buf + 1, 4); + if (ret < 4) + return AV_NOPTS_VALUE; return ff_parse_pes_pts(buf); }
Found-by: Thierry Foucu <tfoucu@gmail.com> Fixes: Use-of-uninitialized-value Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/mpeg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)