From patchwork Sat Jan 18 21:40:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Noble X-Patchwork-Id: 17411 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 0F06444BB1E for ; Sat, 18 Jan 2020 23:40:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB40E6881BF; Sat, 18 Jan 2020 23:40:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD272680B6D for ; Sat, 18 Jan 2020 23:40:34 +0200 (EET) Received: by mail-lj1-f182.google.com with SMTP id q8so6259102ljj.11 for ; Sat, 18 Jan 2020 13:40:34 -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=PE060KMxjnHj7u07iU4SUkXp4fdiDLVR/H2X9NYKexQ=; b=Fn9eR/MRiOXt7t/vKUtLN4WfLHDHzmRK/2zOvxeT6p/owG+IF4PJO/nW3KJcuoTFTI /CfFN+6pErQqyXKhfJ9iBlVUDcEpCGWsu/501ag42bCbfGzto/+BaU41A5BTUi4ml3Ye oQLZIFF49kPue/C0aCaNmOln5VnIOtQWtmHYQb0ca9EtFTd9uAocQjGC9ZOdWEYpIruP p0OxDNQzICWoxAePpPHf1LWaW3FBMc4f0tbpLuCct4I9blcUcxUIvcfvTJm2pa2jOlqn YtmHJysIsHoUZ3kbgkcb9HyJRUXkCtXZxYgc2jXvsue4RDTGMWkev3Y7L9FBy4eRkJLk mO9Q== 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=PE060KMxjnHj7u07iU4SUkXp4fdiDLVR/H2X9NYKexQ=; b=Lj2EwAtvqRfxgyh9iFQVdQz85HzgB2a74Lh7g2ZJEwqTSVkA5OFlB9frwy0Dm66gqF UPcrMjo4gMpcVZ7tVH7OZKth5MP1w09AtB0NoDuiMD4QWy6J3rT4fb+1crld1K6Misj4 6tcXkjNPOsE0Fim4TwMQyGfKp7pzoYiMWVme4AZmHe3LUTuXDp4E7u3hJE0D2GbsVsoF MwB4r3Xq+Mp2grhsvpEivDtnjJ5dJ4PceVHt1H5R67Unn/GAoW+wyCatj4ilCFOM3t7g E0g8Q2MT+R1cJPTY/xmbYBbCunByZliBUkRmbG03Ac982n35HG3KjitawEksmmXY8UyJ sHWw== X-Gm-Message-State: APjAAAWRV7BOsJ5j4ldlNp+qP1ijpBwpN1Wc6kSDiM6fuCJjRH26SAF9 Zou/Kb+e+uoY1Gx2NfK3Roknzqw8BMH33lbxikSwx8wBXJA= X-Google-Smtp-Source: APXvYqwyIr4jpttNg5wGJBvzkhKiWUN+yR6KDjMoGA5Hj1OJ7NK/j53lLDXiclPWbVOVqukwzdneTGPMcM7UQKdbTrI= X-Received: by 2002:a2e:9008:: with SMTP id h8mr8920666ljg.217.1579383633655; Sat, 18 Jan 2020 13:40:33 -0800 (PST) MIME-Version: 1.0 From: Jonathan Noble Date: Sat, 18 Jan 2020 21:40:06 +0000 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] Segfault calling av_interleaved_write_frame 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" Hello, I found I was getting sigsegv when calling av_interleaved_write_frame(). From a18f4cb5b86392c5c161878daea8e4b1204881eb Mon Sep 17 00:00:00 2001 From: jon noble Date: Sat, 18 Jan 2020 21:33:11 +0000 Subject: [PATCH] libavformat/mux: prevent segfault in compute_muxer_pkt_fields() --- libavformat/mux.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) //calculate dts from pts diff --git a/libavformat/mux.c b/libavformat/mux.c index 8ab5ea8c2b..ea79981fe8 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -598,9 +598,11 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * av_log(s, AV_LOG_WARNING, "Encoder did not produce proper pts, making some up.\n"); warned = 1; } - pkt->dts = -// pkt->pts= st->cur_dts; - pkt->pts = st->internal->priv_pts->val; + if (st->internal->priv_pts == NULL) { + av_log(s, AV_LOG_WARNING, "Null private stream data.\n"); + return AVERROR(EINVAL); + } + pkt->dts = pkt->pts = st->internal->priv_pts->val; }