From 9b8d11a76ae7bca8bbb58abb822138f8b42c776c Mon Sep 17 00:00:00 2001 From: Alexandra Khirnova Date: Fri, 6 Dec 2013 13:44:17 +0100 Subject: avcodec: Use av_reallocp where suitable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavcodec/g2meet.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'libavcodec/g2meet.c') diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index ad27c573f9..0b36dbd0d5 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -236,16 +236,14 @@ static int jpg_decode_data(JPGContext *c, int width, int height, int swapuv) { GetBitContext gb; - uint8_t *tmp; int mb_w, mb_h, mb_x, mb_y, i, j; int bx, by; int unesc_size; int ret; - tmp = av_realloc(c->buf, src_size + FF_INPUT_BUFFER_PADDING_SIZE); - if (!tmp) - return AVERROR(ENOMEM); - c->buf = tmp; + if ((ret = av_reallocp(&c->buf, + src_size + FF_INPUT_BUFFER_PADDING_SIZE)) < 0) + return ret; jpg_unescape(src, src_size, c->buf, &unesc_size); memset(c->buf + unesc_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); init_get_bits(&gb, c->buf, unesc_size * 8); @@ -478,8 +476,7 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c, uint32_t bits; uint32_t cur_size, cursor_w, cursor_h, cursor_stride; uint32_t cursor_hot_x, cursor_hot_y; - int cursor_fmt; - uint8_t *tmp; + int cursor_fmt, err; cur_size = bytestream2_get_be32(gb); cursor_w = bytestream2_get_byte(gb); @@ -514,13 +511,11 @@ static int g2m_load_cursor(AVCodecContext *avctx, G2MContext *c, return AVERROR_PATCHWELCOME; } - tmp = av_realloc(c->cursor, cursor_stride * cursor_h); - if (!tmp) { + if ((err = av_reallocp(&c->cursor, cursor_stride * cursor_h)) < 0) { av_log(avctx, AV_LOG_ERROR, "Cannot allocate cursor buffer\n"); - return AVERROR(ENOMEM); + return err; } - c->cursor = tmp; c->cursor_w = cursor_w; c->cursor_h = cursor_h; c->cursor_hot_x = cursor_hot_x; -- cgit v1.2.3