From patchwork Sat Nov 19 16:10:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1486 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp703155vsb; Sat, 19 Nov 2016 08:10:57 -0800 (PST) X-Received: by 10.46.69.2 with SMTP id s2mr2872377lja.56.1479571857346; Sat, 19 Nov 2016 08:10:57 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p142si5062749lfp.32.2016.11.19.08.10.56; Sat, 19 Nov 2016 08:10:57 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BCC6689F00; Sat, 19 Nov 2016 18:10:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAD92689AA7 for ; Sat, 19 Nov 2016 18:10:44 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id x190so38520168qkb.0 for ; Sat, 19 Nov 2016 08:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=hNB++uFaMMN6iKP9uPtAhBBkn5GEgvRI9mhua6KFva8=; b=YbpoJMtCZ11G90l7mU0zNSgQ9Daj94TdF45qH9Xw5iASR/KEzC9o8P0YrE4YjulcXh em2Im+BrusJeFu0bk/UrWTWJTbtcQ1aF8aKuAVcvOnBiSKpHrniRKbWN5hzXRwVEbzcx wCcBKV9AT0Lfylh8pw1Dzuwyq/UxVlmmTGniS1etFd/1BKguWbQSRELOHPo8CW8JRly0 ZQaS4VyOp6P6QdyH85HJFFKVKrQbEqotCIExQkwMT9JvAZ9YAyzyJ0dFgZ/wGQJT5cNe x0nP+9xA+5f9h/LjE1hLsRLYsrlRSioQ/F59/JWAPIFoODHaJyaq4U8rOdkfIqyiX/C9 SbFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=hNB++uFaMMN6iKP9uPtAhBBkn5GEgvRI9mhua6KFva8=; b=hYXOXIc0c7ROpPvKimPxGFof1s5+fooL+6BeazyT9BPh0net9A6U5+VkhnYEbPnsag CrfyOacerIHRc6PxODGjnF+Hr5gy3pFgjKlqn3D80gxvTENvidhG9ywJZaifgFZbSRJd bnW/9tTL1KCcEkQBDIzNXI9uNXgGP9dnUws+AFQEMJ4fAoGMsvM6r/9UpQq/PuUTgOg9 VOKCT8goVAcRZOYn27H4SlBIO2RAG7hzXBto9eHYF0wE1Lqo5z10kUINi5HbEoknIQHL 5X8ImfvHis4fp5pSkBbZpJVvz7FdHT278SO5a1E3T4f0Fsze0vOW1gHiBYsL78VMVUOA i9Aw== X-Gm-Message-State: AKaTC01S6WegHi/61Cbs7WUDFiU3LRUK2bdEFiGyMSZJILockP0vUM6Nb4K/cqUtipdDZg== X-Received: by 10.55.64.79 with SMTP id n76mr6300724qka.178.1479571845730; Sat, 19 Nov 2016 08:10:45 -0800 (PST) Received: from localhost.localdomain ([181.22.0.199]) by smtp.gmail.com with ESMTPSA id 53sm6784691qtm.5.2016.11.19.08.10.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 Nov 2016 08:10:45 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2016 13:10:27 -0300 Message-Id: <20161119161027.4792-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.1 Subject: [FFmpeg-devel] [PATCH] avcodec/avpacket: fix leak on realloc in av_packet_add_side_data() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If realloc fails, the pointer is overwritten and the previously allocated buffer is leaked, which goes against the expected functionality of keeping the packet unchanged in case of error. Signed-off-by: James Almer --- Should i backport this to affected branches? libavcodec/avpacket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index c3f871c..e5a8bdb 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -295,16 +295,17 @@ FF_ENABLE_DEPRECATION_WARNINGS int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, uint8_t *data, size_t size) { + AVPacketSideData *tmp; int elems = pkt->side_data_elems; if ((unsigned)elems + 1 > INT_MAX / sizeof(*pkt->side_data)) return AVERROR(ERANGE); - pkt->side_data = av_realloc(pkt->side_data, - (elems + 1) * sizeof(*pkt->side_data)); - if (!pkt->side_data) + tmp = av_realloc(pkt->side_data, (elems + 1) * sizeof(*tmp)); + if (!tmp) return AVERROR(ENOMEM); + pkt->side_data = tmp; pkt->side_data[elems].data = data; pkt->side_data[elems].size = size; pkt->side_data[elems].type = type;