From patchwork Tue Nov 28 21:47:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 6426 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3708787jah; Tue, 28 Nov 2017 13:47:42 -0800 (PST) X-Google-Smtp-Source: AGs4zMag/bNNuQZ98NnMoJLA3VFX/iJJsbwCeZGVFLBWW97WgemtjHojbSgfL6JyFbjsDIQhSJPN X-Received: by 10.223.132.129 with SMTP id 1mr446423wrg.136.1511905662297; Tue, 28 Nov 2017 13:47:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511905662; cv=none; d=google.com; s=arc-20160816; b=BSdYYKBg+HK9NhsUuBbiuFLA7t0WBh/mtqGMNz8hEKMmj95o+PfiNn4yxus1khXJAN 34iGLIChrzXMF6YrSjwGzs8pxc809PY4iE72SkfI4yTQ6Ul5YIVr+PNFktflpTRTGJaw JI4smtaZZ22FinPNn2pH5n4N7zkBAH5p+M5eWmm8m+hQTeQ8czE8pfdnX6sazke/W08R KvwiImz5ziFfltircj5Ych0nC1yV+nisAfn3pXzy7gR6nalndUbzBxU0SZYZ/+BIP2CI OYIb9CAemYSQBiL7WGPXn/a3/qhWMbZUuKPhViloYVfFqw9/RfB8jAwMaP/6CKfDrNOH 4yfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:dkim-signature :delivered-to:arc-authentication-results; bh=htYIxmqWiJXdPMjMnGOzRC4ywG5kFZjeBvonf+dJaug=; b=VaiGd7W8v+f4oHoPiAhDGsu6UJGEXXToH+6zUQpuaFe+lyzrvocSrgSt7KOPrsxUcV XzSoO26T2SR9RoEkayk1ZdR+m69wgwHeY1Ixiy+5RxMRMUKKcMzIWCqfwWsTT18JkQ/4 4rDig/RNZum9M4wQ/DFe040LzEsj75WOfsq/F6bjE7u2gVd9CXhUjDmWC64tR2GyvIrY 6ry5aYLCYL4txBog2rOvZ5HQy7Z2pa0P8Wu3Jhs0VivZZix3nE/sfRjTfZZAgnIM9jrE sEiiRfDwxQ86Q53nM/wiublnArob4DY6fOSDpfc8xM3ULrRR+HCAYWdajYKerXs31ND7 PtFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=rJ+AQMgl; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=AdUohBQN; 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=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n2si321349wme.57.2017.11.28.13.47.41; Tue, 28 Nov 2017 13:47:42 -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=@google.com header.s=20161025 header.b=rJ+AQMgl; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=AdUohBQN; 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=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C81E68A24C; Tue, 28 Nov 2017 23:47:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C27968A1C2 for ; Tue, 28 Nov 2017 23:47:31 +0200 (EET) Received: by mail-wr0-f179.google.com with SMTP id h1so1485170wre.12 for ; Tue, 28 Nov 2017 13:47:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=z+ko8ZPWCrp1ROikl7hpa2DvAyeo1+11LgPIMSML53o=; b=rJ+AQMgl01Htl1Y6oUnK0hZvra05n823la1SeEQ1LsCvTOb8TTfg1fLP+1n79S4rVP F8qxBm8M1WP9Bj1SZxyfUn2mtbUL5fy7Cnkpr31z5y2EEXuHPGcr+k9p0dnyd6nT1vNJ PQjJXnB/nCSQVIY3R8Bxob/fS3tO0EwpmChiYeRd22Ok63797ZE0gcxxBEf6g53yz/tE QQrSa+3eR7xx5gh8jLbvEW5JtpUsrY3sdOXWyOFs+XjXbxQrL+qE0n3was/Kj+WpMXp7 sdhpc7S/pFW80EtVr5V75Sd+350h5MgC6JTOyw2tjKMXkFn9BUqex6YQDC80WQ8j9E9G AAhw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:from:date:message-id:subject:to; bh=z+ko8ZPWCrp1ROikl7hpa2DvAyeo1+11LgPIMSML53o=; b=AdUohBQN2lDLDJeDBE9S6aPOZmGRKn7JNCtGBVXXQbTkcvUMDU4pyepqWc0jN9/Grf +BAsuwZIZRx8JWAMCSXMNSJ/TIsycY3fLkQmVnmXBJWRnXvOMTnsePsnIxoFot9A/UN3 QhsUxSEnWZmSSv+PBYlcyfdO7lUZcRp6rzSHU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=z+ko8ZPWCrp1ROikl7hpa2DvAyeo1+11LgPIMSML53o=; b=s5QSLzbBurO1Wh9eOJmCWvVJ0tUw/f3K71JX1GQdx9vkBltVTNPxXqSHD9AgksOLgZ najYbpvZEI+/zIkXWnYl4MJW0Y8uFndCE3aywHoLh8zLyYwtwFAJT1zMvFr46iSjOaC1 EstquAjtC30w9/tGIP4ne/0c6VFzDYDtXZbnUFy2ZiGmIADAf72de4/ZyY+NaFVt3d/i +lVLbbwRo6fiOb71Z/mptuYL3E05qovyuUgs380dE7+jNWBl+U7J9RbyJtuZpHNSeVjj bci1DtLkdr/jEQzFXf7DpumU7GnjBwJdJ9yHECpHu6SEyOkoArED3EKKV2HhTuGYVT7W yofg== X-Gm-Message-State: AJaThX5aAo1Wpf+YkU/QOyNIUzeqUoPOYe2BYI8r5xelcalsH2cfYkik HfVpfk8y//w1dGlPVoaTEAPGQAn5iHRmkmv0SBYbz8+wyfs= X-Received: by 10.223.136.253 with SMTP id g58mr508044wrg.86.1511905652941; Tue, 28 Nov 2017 13:47:32 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.161.4 with HTTP; Tue, 28 Nov 2017 13:47:11 -0800 (PST) From: Dale Curtis Date: Tue, 28 Nov 2017 13:47:11 -0800 X-Google-Sender-Auth: dXUvExWSjow2_bGA11cafeNHJ-I Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [ogg] Free opus extradata before reallocating. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Otherwise ff_alloc_extradata() just leaks any existing allocated memory. Similar to the patch for ogm extradata leaks. Signed-off-by: Dale Curtis From ac7f2deaa48ac0578be19b178b7c0bc8040bc278 Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Tue, 28 Nov 2017 13:44:49 -0800 Subject: [PATCH] [ogg] Free opus extradata before reallocating. Otherwise ff_alloc_extradata() just leaks any existing allocated memory. Signed-off-by: Dale Curtis --- libavformat/oggparseopus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index f45ad84874..cd34cf23ba 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -62,6 +62,7 @@ static int opus_header(AVFormatContext *avf, int idx) /*gain = AV_RL16(packet + 16);*/ /*channel_map = AV_RL8 (packet + 18);*/ + av_freep(&st->codecpar->extradata); if (ff_alloc_extradata(st->codecpar, os->psize)) return AVERROR(ENOMEM); -- 2.15.0.417.g466bffb3ac-goog