[FFmpeg-devel] [PATCH 2/2] avcodec/hevc_ps: Change num_tile_rows/columns checks to sps->ctb_height/weight

[Michael Niedermayer]

On Tue, Jun 25, 2019 at 10:32:55AM -0300, James Almer wrote:
> On 6/25/2019 5:55 AM, Michael Niedermayer wrote:
> > Suggested-by: James Almer <jamrial at gmail.com>
> > 
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavcodec/hevc_ps.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
> > index 07d220a5c8..f6e80e1609 100644
> > --- a/libavcodec/hevc_ps.c
> > +++ b/libavcodec/hevc_ps.c
> > @@ -1588,14 +1588,14 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
> >          int num_tile_rows_minus1    = get_ue_golomb(gb);
> >  
> >          if (num_tile_columns_minus1 < 0 ||
> > -            num_tile_columns_minus1 >= sps->width - 1) {
> > +            num_tile_columns_minus1 >= sps->ctb_width - 1) {
> >              av_log(avctx, AV_LOG_ERROR, "num_tile_columns_minus1 out of range: %d\n",
> >                     num_tile_columns_minus1);
> >              ret = num_tile_columns_minus1 < 0 ? num_tile_columns_minus1 : AVERROR_INVALIDDATA;
> >              goto err;
> >          }
> >          if (num_tile_rows_minus1 < 0 ||
> > -            num_tile_rows_minus1 >= sps->height - 1) {
> > +            num_tile_rows_minus1 >= sps->ctb_height - 1) {
> >              av_log(avctx, AV_LOG_ERROR, "num_tile_rows_minus1 out of range: %d\n",
> >                     num_tile_rows_minus1);
> >              ret = num_tile_rows_minus1 < 0 ? num_tile_rows_minus1 : AVERROR_INVALIDDATA;
> > 
> 
> LGTM

will apply

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When the tyrant has disposed of foreign enemies by conquest or treaty, and
there is nothing more to fear from them, then he is always stirring up
some war or other, in order that the people may require a leader. -- Plato
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190630/632a23d9/attachment.sig>