From patchwork Sat May 5 17:43:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 8793 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1270482jad; Sat, 5 May 2018 10:52:19 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrYT7qg8y6O2QzWLfG52nshfM95mKONBqlGYNeNGW6VrlQ9/4iKOQAIufNJPRS5y9BI0oov X-Received: by 10.28.195.85 with SMTP id t82mr19773707wmf.129.1525542739284; Sat, 05 May 2018 10:52:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525542739; cv=none; d=google.com; s=arc-20160816; b=Vm7lF3YRb7NFe084Djgm+U6d5qp8HbLmESuwvq7JDJ6rGrbyJxoqHZYjyHoCx7roUC w/AgOe/IJP9HRH6onAKCcPxvT5DqPg9NQAFZujYcfok3IOk+mcCilxvj8LatU2YNW0LN lBSWwquLuwV9tVX/WP8iKhk3zGPCKdIYqEW3TE8cD4LQIokjKPETEQGdmJ7Nr9ZsyZUl Y+0hHNhGBUMjvuj6fgwipUv3ondoUWJXTu07R2uXgNFTEhxgDqVBxdgWKhGF4jN9bR2z Uu8WSX/BnqGxxbHUsfO5A6dH3kQ4g0AMLP2+XeCBKh357aQAB2EkfJ42p6CvvQmvIygw VKAw== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=6s2XVLO3ZPsEnAVN75AuOGMP0SUqaKJve/IimXfAp7E=; b=nRbyGyZ7aBAuzEMVCI0oGWsxWNfp/9cRpL7zM8BHsbvR+XoDqEL7pIaI8qbSpdKsIm YVrvB106L16NTRxNkU+sDET6rYBw+brVlVulos+i57u8ZmSHbisFse3nFRAFyewvje5T Eh1nTOPdHLR4kCHxfphZCK2TZdL5dAfltLpj7GaMgqq7/jGg3tgaiP+rcXhtvHyVcPV1 K4/06TAo00Tw1PzdwI5yeq0a3fdu7Xhx+37uuoJ/OGjPvvxv9SdqN+dg0LeNbs3+GXgN iSaEHGb5f5FnTNB4StTux1y2e57xQYYgOda6jVTC3ZYYwh11v009lC2lz2lR5+1uOthl zC6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cPzrcgRk; 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=QUARANTINE 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 p66-v6si5916495wrb.409.2018.05.05.10.52.18; Sat, 05 May 2018 10:52:19 -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=cPzrcgRk; 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=QUARANTINE 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 B8C8B68A430; Sat, 5 May 2018 20:51:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10BF068A37E for ; Sat, 5 May 2018 20:51:37 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id f6so8306273wmc.4 for ; Sat, 05 May 2018 10:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=BQBo6f3Qi2C/2pnq0jBNiuCyXRfMWMT/ff53uW22Lgg=; b=cPzrcgRkybBjQTjoemDctggHCzr6Tvnqylc17Uzazuxwj84J6E3w9HYkBCZ69/nkgC IcCo8f2AjLXrmC1joe+DCkArn9lnqKrOh1s4VlDfV6HA5XKRNLJGJNAmK67cVOrBt58K 8LxiTDsEcWjWphiWr8pSLE3EtKATlNpehPqGga5TnXYP6YzID6W/RsWBawbNVt7oC1Nc CACjbA4hwI6pzR3OCUjPrt4KaJp8yILhPjxaFBJejMlo9gyb1Nd9DHrwF2Fphu10jX4c 8wsyE07kV1e8+IcYRxnItwIC02cvY0Yrh0c/+WjH8IVvRAYLlUQXQvCY2osi0CWB1aea 4/Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BQBo6f3Qi2C/2pnq0jBNiuCyXRfMWMT/ff53uW22Lgg=; b=hA7DMGl5ikB/cPeWWB6xmiML0ZW9+7QlRvRi8VqxwEdt5RUvW8BWMsoXgBUjh4hCU1 +5OJct0oM0gqgmvCl9sQX3sN4j+30fA0HUWXANmDqlOtXi7CQqt+SAaLKBk9+cHa1OfY NkqbAS9CcpTPHKkH0jxTGyrup/1xKgjAbHA9BTTRcnvnQM781EvAAivcPnl8+u89pSB4 /G1VZVdII4vsbbBVTkn+JV6kE2WXzp5xpTZjpFscb2xKraP+EcmrYhoJ4Qs0/KhroyQr cMaR1ldoKb26K7wvs6tGaP3vKHd1zGxQiW9gUnf3Kni14VSRdhqQJCBc+JXjSRFyD+ot xKxQ== X-Gm-Message-State: ALQs6tCE44TWU+YVS5GuWAeYW2RHHD7aOLnrj0KMBmnV7pdgh/6Ag8Pg 8gbF1FHjlmLuoOSxzcRtQdyHlAKO X-Received: by 10.28.224.6 with SMTP id x6mr18840987wmg.80.1525542287969; Sat, 05 May 2018 10:44:47 -0700 (PDT) Received: from moonbase.pars.ee ([2a00:23c4:7c8c:8e00:443f:7fdf:57ef:d4c0]) by smtp.gmail.com with ESMTPSA id b57-v6sm29573162wra.9.2018.05.05.10.44.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 May 2018 10:44:47 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 May 2018 18:43:34 +0100 Message-Id: <20180505174334.2408-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] dcaenc: fix segfault when attempting to encode with invalid samplerate 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/dcaenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 186997c631..4b4ceeff05 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -152,8 +152,11 @@ static int subband_bufer_alloc(DCAEncContext *c) static void subband_bufer_free(DCAEncContext *c) { - int32_t *bufer = c->subband[0][0] - DCA_ADPCM_COEFFS; - av_freep(&bufer); + if (c->subband[0][0]) { + int32_t *bufer = c->subband[0][0] - DCA_ADPCM_COEFFS; + av_free(bufer); + c->subband[0][0] = NULL; + } } static int encode_init(AVCodecContext *avctx)