From patchwork Sat Dec 22 23:38:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 11523 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1E1F944C5F6 for ; Sun, 23 Dec 2018 01:38:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6CAF68ACEB; Sun, 23 Dec 2018 01:38:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f177.google.com (mail-it1-f177.google.com [209.85.166.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E80D68ACEB for ; Sun, 23 Dec 2018 01:38:31 +0200 (EET) Received: by mail-it1-f177.google.com with SMTP id w18so12074925ite.1 for ; Sat, 22 Dec 2018 15:38:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=ZRf+Mv3lt7ZOODFyE4cd7froGGZ56TrjP7VYqIm75/E=; b=M4OgexVauo8OdokFYqpezwAN0dwr0IPFmYoozpRzkJFxSW87xCq4lVVNxvaie60NyH ZsEssdo2lHrkQnWk/GL3op0qyhxkr9+O+Vj/Xw1t8+1qybCu6S4nb1BEGbalg8s5vdrL cIYhHxvJy5D0QkCurBACC61VUp24auUbt6aMjF38rCwtP51Cs1/JR55K+LHUnpa4QoXZ 3UpSj3Nh3hWh/Vwchq8seosVaXnszt5Yr8i58E3m5xicOcndWk5jg+OJGnGsuhKmOttc XRxomsNsp72OFDEdC8pc6Ra+gSqzwLWmW6fgCRLdSv6A0za3crO1Gw47AAbTrH3tGnLd fMsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=ZRf+Mv3lt7ZOODFyE4cd7froGGZ56TrjP7VYqIm75/E=; b=Xacqtb5zFyhqOk37MTQ4ZB918tYM+SQV2Mw84+pgOybYpB2K9jybbiyiHoN5v38fy6 /CLpANJpZLoyNxOXKjCUqLv2gOrvQ/hFNHEWAs04NPBG8sPpzr5wDBp9OqH81w53nopZ RXT86iatjuej0/PeeunF4EatX+3LC2hloHT9qjI5MLFPd30B4aLR5OYNVCsksITzLpBa ONLjsDlifY41gel/hTUsoas4IPkG9BOmUrO5WbluUBvHwiyeylJlLimSxOZXVxm6831z aHnXwzDobMjLIKGGacoJJkCxAt4tNOjCVwNzVlQY0zKsXnutKkajr6cw0V08zdkZ0YFg 4ZSQ== X-Gm-Message-State: AA+aEWYJFV+Dzgqs120h7lqQ4xaRYajD36TRrLtfSR4m4V+0Y721xOkY OAW7UeWjL/TAI3IMARP+aOvoKT7+E5B7NvedPoi4Pw== X-Google-Smtp-Source: AFSGD/UgzlEAufT7bkpA8j7w+6WYcu2vxyuQOd9+dCMjQvQcwmKhAYDCGBZcCcjMPE6e1hj33OVE/fAfAIaxptTXnY8= X-Received: by 2002:a02:8a1c:: with SMTP id j28mr5338157jak.49.1545521913701; Sat, 22 Dec 2018 15:38:33 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:5f11:0:0:0:0:0 with HTTP; Sat, 22 Dec 2018 15:38:32 -0800 (PST) From: Carl Eugen Hoyos Date: Sun, 23 Dec 2018 00:38:32 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/vividas: Do not increase extradata_size after allocation 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" Hi! Attached patch can avoid a crash in avcodec_parameters_from_context() if extradata_size was increased after allocation. Please comment, Carl Eugen From 37ca1caa949902ec209c7c779b2c5b0ca3d3a3e6 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 23 Dec 2018 00:34:57 +0100 Subject: [PATCH] lavf/vividas: Do not increase extradata_size after allocation. Avoids a crash in avcodec_parameters_from_context(). --- libavformat/vividas.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index e199b05..00a1a0f 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -392,7 +392,8 @@ static void track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t offset += data_len[j]; } - st->codecpar->extradata_size = offset; + if (offset < st->codecpar->extradata_size) + st->codecpar->extradata_size = offset; } } -- 1.7.10.4