From patchwork Tue Nov 21 23:12:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 6250 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5886189jah; Tue, 21 Nov 2017 15:12:36 -0800 (PST) X-Google-Smtp-Source: AGs4zMYg8KNMFTxtewkCK89VREJObF/74ycDeMxaOkIh9pgWnCiuneRZXPtZrkvpwF5eaMSNk2OM X-Received: by 10.28.74.213 with SMTP id n82mr2791555wmi.15.1511305956148; Tue, 21 Nov 2017 15:12:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511305956; cv=none; d=google.com; s=arc-20160816; b=M7+fFEkAAziHopaiarWzatGiRY3aif/871uDJ8JfP0QDVeWB2hD11a4u9QGNHA4uOH TzHvtTYwPMCxS9wFl6p8oOJLYwfb3aohjLKJ1Hh35nMaAjJ3jAGtpSDJN2FMR0hnnNrr ZU0Qjb0AtB23l/D2yK6zJm7sghtW5uw9MjbtPs19VTXviYZwKPNnDgLj3XoByasm2Scu eqbKJORccq1o0Q0rSDBe7gX4Hp7BeDChsPA/6yUehrwR957mn2/npFC6NLYJAWAGHBBl DT2lD6msn16aYrWpi295MwUQhv+9UB4Ybbg/PZDLzg+pBe6x2JiVDbp1zO4UzJE4BxRf 3H2w== 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=KyCkweEXuRvWVnWlOMgjpfJZBN3IUVWCYQQJ3AuYpNU=; b=BhFVgVgEVzB6QhSLE4Ku5nDBoD/goXxsXOe3lMZg8G5vR3V19PLIlCR34ouSpRr5zL TUEgrEE6DZ7OUO6TUDYvx5obNdShRiXwbdBtYK9cTGESzUyFj16YEqtGg53nQHkyiggI J32YxJ/f6NOS3DE0nzyJrfNT5209Kus07j0/h4eXvKUPpzK9azxRCHjFPpWWf4m7YhRZ fgJCe/JG6frqXpj3nQ5PmJC6V+ZqP/V+HfzMgsf0ApTeExtM50iIDQQpZkb048X8koXg xBr5EHJs2QFNxZNUJ0DanLZGRxPAK20I5mBCrpAADn+1Ph0Zt0XnUmFPoEWVIoBtWR0n VctQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=ZyH/li7X; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=l+Su1OEM; 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 w142si1805970wmw.195.2017.11.21.15.12.35; Tue, 21 Nov 2017 15:12:36 -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=ZyH/li7X; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=l+Su1OEM; 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 7228C689C7D; Wed, 22 Nov 2017 01:12:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A72DA689A40 for ; Wed, 22 Nov 2017 01:12:28 +0200 (EET) Received: by mail-wm0-f51.google.com with SMTP id b189so6657577wmd.5 for ; Tue, 21 Nov 2017 15:12:28 -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=6e/9OCSyakm4luj19WLF2bSHpS54MmoD8bpVfATGLPk=; b=ZyH/li7XATb5VgmCFbzero9YqMg0kV0GrvZfrgOLEm3IpdoNFOves+dCDuzf+WiO11 tiSS2NAI+yF30/rtPaLyA7LqepPY1IQjgZklmKda/IthG8V8UvpRdV7t20W1zV9Z5Hd0 mGnebj6CqmEEno4icvTGIRKH0GuePi6ve/sSht+SL8WbZT5/DT88GFb9Z7kLNM7Uyt3O v0w1FtkUV728MAuUVdtfmqK1IgfsT49sdcV19jqfSYTsBIJ9s538KXMrCnAIYVqXNbZ3 FfDCXvLyjTwLPoV99GCUrqTi21x4Bi4Rr8WS39OE5LW42tHLo54xqFpOhq13Fs5UyQuI alrg== 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=6e/9OCSyakm4luj19WLF2bSHpS54MmoD8bpVfATGLPk=; b=l+Su1OEMG2YR2MSxi6lcZwGE9794NCM8mDmBTTrm9wuiYeU0c/K4cmxVTWGCONsBVq 83I0TJDMVZeuoKf0woGFeAWgaSJKwLuRaGZzw3q4G+97l5yYCvSbAKmal0qRpz3FNK/B r2G9A58FIzIR7AJUelKBShN5RcTGJmEGymCxo= 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=6e/9OCSyakm4luj19WLF2bSHpS54MmoD8bpVfATGLPk=; b=BRPw/CdGDQ77ItOCMfLTACrzFGk1BiOJqwNJfUdKzvHGVW48fwyi7CiGa0gTeUXRkZ 2yHcXiOdwopP6w6yyXj8bbyIPmFty8La5CSePgDsZG4Sgv4vwnn8ZZGQt8pICqMIcUBI 2677qUHeXNhaTrbknpDcw367w+eQyFVdT5qu3qhfAqJNgXwXnFiobbi+Chze7lqWYcdT LPdy3kxSMsi3SVXh3fWT2T9Bbi/YDeaNem5z71E4oOlX9nyNzmWCU3LXEGt4F1EiKKYe lTh7As9RBvi3hjYRSrT/6DhTtnjpEaJKo8Q50NYJR9Yi3M7J3RAmFV0OyTcXLWzqjxke zG4Q== X-Gm-Message-State: AJaThX5NDq0IFxF/ZorVMnlrJH7TpuWRfePA/tM7Gl+hh6y++0hp1n7B 3/tbSaK2rU10uxYdipbQ0q6LPt5U2TMrIhNqDeW1sr6CO0U= X-Received: by 10.28.238.221 with SMTP id j90mr2687686wmi.44.1511305947763; Tue, 21 Nov 2017 15:12:27 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.161.4 with HTTP; Tue, 21 Nov 2017 15:12:06 -0800 (PST) From: Dale Curtis Date: Tue, 21 Nov 2017 15:12:06 -0800 X-Google-Sender-Auth: NBbnjATfKp0OXe6w1CYrn7TkxjY Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [ogm] Free 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. Signed-off-by: Dale Curtis From 15db35021f026296aba46699cc282d77bd1d295e Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Tue, 21 Nov 2017 15:10:08 -0800 Subject: [PATCH] [ogm] Free extradata before reallocating. Otherwise ff_alloc_extradata() just leaks any existing allocated memory. Signed-off-by: Dale Curtis --- libavformat/oggparseogm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index e7a501b5a7..fad093b629 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -110,6 +110,7 @@ ogm_header(AVFormatContext *s, int idx) size -= 52; if (bytestream2_get_bytes_left(&p) < size) return AVERROR_INVALIDDATA; + av_freep(&st->codecpar->extradata); if (ff_alloc_extradata(st->codecpar, size) < 0) return AVERROR(ENOMEM); bytestream2_get_buffer(&p, st->codecpar->extradata, st->codecpar->extradata_size); -- 2.15.0.448.gf294e3d99a-goog