From patchwork Thu Sep 21 22:04:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5229 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2451685jaa; Thu, 21 Sep 2017 15:05:23 -0700 (PDT) X-Received: by 10.223.186.6 with SMTP id o6mr2808023wrg.263.1506031523442; Thu, 21 Sep 2017 15:05:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506031523; cv=none; d=google.com; s=arc-20160816; b=s/XciIFXVB1n9M7RsNJk1gfZj2uptI71J0WuwfQpQaKY7xYcT+tf7aBGAZrvvkdsG0 qzD75ZUUFIdz7N3ULy9EemkNhNH/b4JgFGR9GJK1a6e3h/9ijg8JcXGtJUyqz4+gvgCd AnJemUXPJIWajw27YsFFfOHoQiKtkqOLd9M14eO4wwL81wA3IU8S3onDXT+DG49qRCCc QIlBH5Tp56c1ZtCt62KGYuS8jU6k4HB33ydqftyAb4k/AGXhziJsN09yFjwgUQvijXLq FxHWVkLFuZc/VMVoktQD/iCizH1pSvG4xLJjc4P3snPacFgq/AuZ6gl9ghZYUHZL2Pse 9WeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=doLtIRzlfQD7ucKa0l4OPVjwFz5xn8F54Imx4FPphVU=; b=EHiZ98A1oEiUZTwJTUvEq9gsqrS8H4DfQeHHAnOisA+DaDeWjZOFLK5W8IhxwXsIxs 6Ni+vjlOqqFYbGFH1Gs8YVWh5shbSfsVBpSmtjwgAG3uDgMKMqfV1dS1O2pxAU7fjE6h SfqAmOdokFD/Vhu03ux+4qQGv1DrdoptoBuPwQnHLLIaelR8mIcMQh/S5D0GbfE28dK/ BsW4BFntpzHyxDxn/th9kaCpxMX6FZpGiyCB7QmZluV5do8B70KQkybPH6Zki8a0KlgZ 1WwWHglpQiBxCpy4xQqvWD9VxMFkdlRYuG6zGWtabfCTrlwnFMd+X+91c+osrJNq4gb1 bVTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WVjusEjk; 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 sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f12si1899507wme.202.2017.09.21.15.05.23; Thu, 21 Sep 2017 15:05:23 -0700 (PDT) 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 header.s=20161025 header.b=WVjusEjk; 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 sp=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 09C1A689216; Fri, 22 Sep 2017 01:05:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2672688331 for ; Fri, 22 Sep 2017 01:05:04 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id r66so4471058qke.4 for ; Thu, 21 Sep 2017 15:05:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=/CXcTEz5ANrWSob2bGtRNaisXdVQvDQMwKA+/KBtNnc=; b=WVjusEjk+dbXQiGsX2oldJxn5cUeu23txeII3FhLE5vtdO0t4l453IAXnsgMOgvipw b4HjQSxfKFZBESNLgp3yy+zB2LPJW5+99F/nKrU8Kwc1ZNFIsqWIJ9jLgi/iXf/tt5DN RbkloK/QKz4vDB1FHGJUv07/qGR7yOezFPqubA83SPJQAH6d8HaN1rxMMbIr2+oBq1BO /6JApqYB4pzeLs4ZstGNpM4725UVCtPqbpZ6i5mr0uISX56Xa35y910n2Li5oN2oklm+ mGpBozdAtMtluQ5dnYBN9WbQzR6BwIiDVKEODTNu3SrQOLWaVEmE+4hZlNvziFXhE2zZ nPMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/CXcTEz5ANrWSob2bGtRNaisXdVQvDQMwKA+/KBtNnc=; b=G0WLAr8tHx3ahXcHFHCtP69eRRf7Ns5Es66AKVIJs4hnnU6M+sdwE6deap9M0RK4K0 kfnYgreV1z/2nHssOcSDYfcYQWbdySQZ/eEABlWglLmyQA/kIgbuu3xKreSBGzcbvwJS DLONoaeYxM93lRGwZguVqJx2iSBpe/Apmt3tis0wT6Xk/CgpxN0eVfALH8arJsmbpenL gnB3Dl8hqrLLzGkhnSiyxDNlmdobscQeIgZGUhTYKDnCbw4Ctc86KtRl2l51cymggq1b TBaZ5Z4NvnJIsyLKsiiRLyWvLalK1MAuISznBhPOwFvRDvSHTb5Bb82I6asAqbtygFSL EyRA== X-Gm-Message-State: AHPjjUjmrr39wVnZaC/RH/Kg1li8x89pONxhkyfS3Y0ruJQBJHhR/sxe 4ZFEylRPZDcNXBy8nB7bxBpBHg== X-Google-Smtp-Source: AOwi7QC45aCNql19YnTBMVfQQAwMYYNy/pSmn5Nt7ZWBb0Jk0z06a0nKtCnW9vW0JeRIAF/4u9pfGA== X-Received: by 10.55.126.2 with SMTP id z2mr5471685qkc.39.1506031513641; Thu, 21 Sep 2017 15:05:13 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id u23sm1688944qki.24.2017.09.21.15.05.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 15:05:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Sep 2017 19:04:38 -0300 Message-Id: <20170921220438.8216-2-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170921220438.8216-1-jamrial@gmail.com> References: <20170921220438.8216-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/avpacket: fix leaks on side data copying failure 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" pkt->side_data_elems being set at the very end of the process will leak memory if some side data elements were already copied before an error ocurrs. Signed-off-by: James Almer --- libavcodec/avpacket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index a68e2501ad..13e830b781 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -230,17 +230,20 @@ int av_copy_packet_side_data(AVPacket *pkt, const AVPacket *src) if (src->side_data_elems) { int i; + + pkt->side_data_elems = 0; pkt->side_data = av_mallocz_array(src->side_data_elems, sizeof(*src->side_data)); if (!pkt->side_data) goto failed_alloc; + for (i = 0; i < src->side_data_elems; i++) { DUP_DATA(pkt->side_data[i].data, src->side_data[i].data, src->side_data[i].size, 1, ALLOC_MALLOC); pkt->side_data[i].size = src->side_data[i].size; pkt->side_data[i].type = src->side_data[i].type; + pkt->side_data_elems++; } } - pkt->side_data_elems = src->side_data_elems; return 0; failed_alloc: