| Message ID | AS1PR01MB956473F7529A463D0DFC230B8F109@AS1PR01MB9564.eurprd01.prod.exchangelabs.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,01/21] avcodec/pngenc: Avoid potentially truncating integers | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
tis 2022-03-15 klockan 21:06 +0100 skrev Andreas Rheinhardt: > They emit better error messages (it does not claim that inflateInit > failed upon an error from deflateInit!) and uses our allocation > functions. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > configure | 2 +- > libavcodec/zmbvenc.c | 41 +++++++++++++++-------------------------- > 2 files changed, 16 insertions(+), 27 deletions(-) Looks OK /Tomas
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 3ebcc1e571..64a9f5cc95 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -528,7 +528,7 @@ static int encode_png(AVCodecContext *avctx, AVPacket *pkt, PNGEncContext *s = avctx->priv_data; int ret; int enc_row_size; - size_t max_packet_size; + int64_t max_packet_size; enc_row_size = deflateBound(&s->zstream, (avctx->width * s->bits_per_pixel + 7) >> 3); max_packet_size = @@ -537,8 +537,6 @@ static int encode_png(AVCodecContext *avctx, AVPacket *pkt, enc_row_size + 12 * (((int64_t)enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) // IDAT * ceil(enc_row_size / IOBUF_SIZE) ); - if (max_packet_size > INT_MAX) - return AVERROR(ENOMEM); ret = ff_alloc_packet(avctx, pkt, max_packet_size); if (ret < 0) return ret; @@ -845,7 +843,7 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt, PNGEncContext *s = avctx->priv_data; int ret; int enc_row_size; - size_t max_packet_size; + int64_t max_packet_size; APNGFctlChunk fctl_chunk = {0}; if (pict && s->color_type == PNG_COLOR_TYPE_PALETTE) {
So use 64bits for max_packet_size instead of size_t which might be 32 bits; this is consistent with ff_alloc_packet(). Also remove a redundant size check (ff_alloc_packet() already checks for that). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/pngenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)