From patchwork Fri Nov 4 18:10:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1295 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1449173vsb; Fri, 4 Nov 2016 11:11:03 -0700 (PDT) X-Received: by 10.194.142.45 with SMTP id rt13mr4661341wjb.22.1478283063566; Fri, 04 Nov 2016 11:11:03 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f13si6536236wmh.140.2016.11.04.11.11.03; Fri, 04 Nov 2016 11:11:03 -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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02957689DE6; Fri, 4 Nov 2016 20:10:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0436C689DDE for ; Fri, 4 Nov 2016 20:10:51 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id u144so5073790wmu.0 for ; Fri, 04 Nov 2016 11:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=0UccqdJb+w/dO3EU/Q5XSxB+z1PQukux4WcJ/zFP45Y=; b=AfPQiV2ZRX8A6rJmFOEw662dSxwD8cXbW79FVYgSulqVOCQtl3DptnqRWVyMp2ZSJh WRCAoH4lX9SdzpZWW4KHC97VDO/HkkhFwhrC+lNQ6xPMCiHOM6zELhoA75CAVkeXidH/ 0fDVBS9T6mFLcPNZ3eWBtpVXeYMyXeg4N67RgG+OVMNPFbvTt542vpWx1Zp9d8N4bwhp TOiIyMVnk6RNOTHGirR6zqj+1j7y5vvyJHU+K81/5r7bgUtH8vJSBzGcVY6w4tPUGISy mqsDti9LY4Wba6aC8mluTLmiqaxnxOcYCxRYRmDuVoK1jvGrnfo1YbTlifCcbIDLgIwg 0WBQ== 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:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=0UccqdJb+w/dO3EU/Q5XSxB+z1PQukux4WcJ/zFP45Y=; b=Jr4ksMuYx+GwN5gFzO9Avjkzmwytihv1wDs0SN/Fdhi607m5z73dk6468kY1SHpGKV yB78+BXJz0RWjWyRnJKefQACod+gv8lKL+HNVk746Nz6HLzGacKjlA/qJPrNMobjgsna ODHSrRhMlkxsxu3KNM+Iu4zIsqVfCIVua7agju7F70H+BRSKf/0NsVYTJ4/oKO4IBU8V FmA5NEVApAqnoIKIR9hvdQOwt6xG6+ijLBBrjY0sTAAtI8CmjnnKqqsE830N6qx2NoOn LB4aaxhoCsSSvTHWt8z8wheQdM1s2OKz0M34j98BsjXYS/n2wtADneIzlr/nfXg6xQox BQWA== X-Gm-Message-State: ABUngvdwtnqHEBJwN0t7K6xX7sspeBozcOPLt4ZdSkTJ+jf+L6ZF2LrwoUZAuwKhFPXtHQ== X-Received: by 10.194.248.162 with SMTP id yn2mr12801313wjc.203.1478283053928; Fri, 04 Nov 2016 11:10:53 -0700 (PDT) Received: from [192.168.2.21] (p5B09506C.dip0.t-ipconnect.de. [91.9.80.108]) by smtp.googlemail.com with ESMTPSA id hb5sm15514836wjc.5.2016.11.04.11.10.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Nov 2016 11:10:53 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Fri, 4 Nov 2016 19:10:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] diracdec: use correct buffer for slice_params_buf realloc 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" This fixes a double-free detected by AddressSanitizer. The problem was introduced in commit dcad4677d637cd2f701917e38361fa96b8c9a418. Signed-off-by: Andreas Cadhalpun --- libavcodec/diracdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index b183fad..5c669ff 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -907,7 +907,7 @@ static int decode_lowdelay(DiracContext *s) int slice_num = 0; if (s->slice_params_num_buf != (s->num_x * s->num_y)) { - s->slice_params_buf = av_realloc_f(s->thread_buf, s->num_x * s->num_y, sizeof(DiracSlice)); + s->slice_params_buf = av_realloc_f(s->slice_params_buf, s->num_x * s->num_y, sizeof(DiracSlice)); if (!s->slice_params_buf) { av_log(s->avctx, AV_LOG_ERROR, "slice params buffer allocation failure\n"); return AVERROR(ENOMEM);