From patchwork Tue May 8 19:46:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 8884 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4421953jad; Tue, 8 May 2018 13:14:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqrLQ59bVUX7eZG9naj1osu2vwHgaS3EXS49e6iNu1NNcVW5BGCzMgR1WENbJdnGv+YuOrQ X-Received: by 2002:adf:ce8a:: with SMTP id r10-v6mr32891508wrn.222.1525810445863; Tue, 08 May 2018 13:14:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525810445; cv=none; d=google.com; s=arc-20160816; b=FkTD2Iw0IfH9Er/FMlmKjEr+qsLZcyjkVzHQBnPJneHmVQXFbyAxs1gt4TPuU/GKXY YhYT0t3E8dYobpavjiuUcMHgKiU3oBS+lmgYdbbB9F29/e5C6zQgWo+NDeFQ/io99Mvy BoIbggEImwxMWUsHZsiZj3v5LSfHgTtmgg+ab4/y9hQiQNoC3E6nIDAT2Bf3+hvIDlb7 Lg4x7dr+lAQJg/bkGPK7o+6ghGGoe4Yc3N0wePFsWQT6YWd01k6POkbbsA2ZW/fDBoUx NTuDdNnVNAOKACVOc/G29FsJtxWkyDhXm1u+GzlikTZVQfNSozwUb6uMqogvCXIbkhiH 2riA== 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=a+uMykSeIcAhD/WtFAqVu2LzuACqmpcAc9QHmtfDuYg=; b=B5kbXmUkDqbdS/BDRYirDAAkIzv08O7C/iDJVormHnbWRCatrViqontD2Wz++6jGSf ARMjl5sKrh7DAbLOazyeUUZ/HJs6JRsSoPC03Bcpl+cxmoKVEUNad1mB6kYCsfPD13nW DhJeTU4NP18A7t4XYNydr3ptoIrnKeyUuOj/6LTf8thvZuSb/NuqeCS+0fC1H3JS7k5J R+aiCBAi761VmyX4TlSehCFa0HAHVD2JJY3ZPw1WBJq1BaRX186n7nPp1Fn6kQOGlNxK CmAW761CexhdZC/jkduAagnFCrGN31QKdT+mhjH9hdGe6ZK8a8BqMI2QGl6Fbr3PYytF UWiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=vrQ5AM5p; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s135si7043148wmb.142.2018.05.08.13.14.04; Tue, 08 May 2018 13:14:05 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=vrQ5AM5p; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B2FD568A77E; Tue, 8 May 2018 23:13:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7F9D68A6F2 for ; Tue, 8 May 2018 23:13:20 +0300 (EEST) Received: by mail-pf0-f196.google.com with SMTP id p14so13094394pfh.9 for ; Tue, 08 May 2018 13:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=t55clQAfCjYk91lZ2iMibsEHriNBOUjXpfwa93Kb2us=; b=vrQ5AM5pk5P+Cbq+iFyylg+Yuqmjs6w0KFB0DyRhWvMc6G+LnRMTPiCCDWj3vqB4Y3 Lz/ztmMaAV5rWYq830nRnGwsACG8BfgiVA9Hc34FB+4t2YQi6rvMh/bcGsmd6v65nwsT iDF3gaM2ErqcSAakRJJ/qvb1uvnoC57TiomqliAVt2y91uKeO1ljfe0256UlGHyVxOED DuDHOARUTf+jo2NDaBt1OsfBqFNxRtop/laUIauo15bvVAjF7IlFkmaKRKrpATQYo68I +ICmgis/ylM/bVc9qCHbCjRZDWSqKAuzLvZo3XEod0jrx6JGQi9s/4apYqW74y4x/5Qq khwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=t55clQAfCjYk91lZ2iMibsEHriNBOUjXpfwa93Kb2us=; b=K0xBPPGvkSugytAkCQoHdHE375t8AKIdrLJzkjcWykrS7k+Oi3NDD8oWaLnTi3ZHOg cCY1YvS7PzudH/sZrE6QxgQokFq6qEhvyvuX05aT0k/zT/p5sIMILdnRvPA5tlFBAEyI Gdsga/uEi6Km36hk5ftKdDi+QOPs+TWgKGjtfpVBwUuymbhlIdHFja9xKHNfQdqa9eHh 5OVdzO0wXZsFM4oUtCVnxJS/woBMBu9J3wOYyu7fgyYmx77u+HxZMjlSXjgFjgu30toh Ft0ktT6B8sVUCrvSgxr27No86sDnNf9AxRi3tsCmJG/HDVgRtV9R7oxWiMHYmVpgPQZX Olng== X-Gm-Message-State: ALQs6tCodnbIh6tsTrwZiFSZRueM37TMFjkzLVpz6W/GAMYa/wzIZeJa lalJTr5ejXydcnt8aP5NVjqnADCL X-Received: by 10.98.217.5 with SMTP id s5mr41660930pfg.20.1525808811686; Tue, 08 May 2018 12:46:51 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id 69sm35086452pfh.33.2018.05.08.12.46.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 May 2018 12:46:50 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 May 2018 12:46:42 -0700 Message-Id: <20180508194642.82378-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] ffprobe: fix SEGV when new streams are added 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: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- fftools/ffprobe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 8b2a18b6b1..544786ec72 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2371,11 +2371,11 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, goto end; } while (!av_read_frame(fmt_ctx, &pkt)) { - if (ifile->nb_streams > nb_streams) { + if (fmt_ctx->nb_streams > nb_streams) { REALLOCZ_ARRAY_STREAM(nb_streams_frames, nb_streams, fmt_ctx->nb_streams); REALLOCZ_ARRAY_STREAM(nb_streams_packets, nb_streams, fmt_ctx->nb_streams); REALLOCZ_ARRAY_STREAM(selected_streams, nb_streams, fmt_ctx->nb_streams); - nb_streams = ifile->nb_streams; + nb_streams = fmt_ctx->nb_streams; } if (selected_streams[pkt.stream_index]) { AVRational tb = ifile->streams[pkt.stream_index].st->time_base;