From patchwork Fri Oct 25 01:54:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugene Zemtsov X-Patchwork-Id: 52485 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:be6b:0:b0:48e:c0f8:d0de with SMTP id bd11csp38340vqb; Thu, 24 Oct 2024 18:54:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVBReUKYd0fXj1kWyva/MwVn4K93TgVhsnUG1nuI4HfLvw3PZEy7jhx9lLUjU8TKuPArzq/jQCWO54IC1kbx+yl@gmail.com X-Google-Smtp-Source: AGHT+IEuTpMAO4SQAEJIo/0gIWqtmxqgek5O0Igv3Md3bN8FcQH/MOHDJc7lQUPGsPp9eSibGzQK X-Received: by 2002:a05:6512:3c98:b0:534:5453:ecda with SMTP id 2adb3069b0e04-53b1a3136d3mr4562389e87.23.1729821282220; Thu, 24 Oct 2024 18:54:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729821282; cv=none; d=google.com; s=arc-20240605; b=aS89x555pdcSPgeF0I6Zc/aASELkeEolXLKJB+Iwgo4pqxyHJK6OkIfPKWxu7ZI7dF 5oFNudppeSppd+9nDnZHIPxmrA5jm1r2r0InBoS9URmZOrqWFnme3HBQxGYXVOk2TPe1 Sbz44XOAXELBc9ebkR5b8YrnqJ5Gewzb6WvhcHPq4w9HtI8igtDSOC8EyOoT+WCLNjvx TUiawqZ8DyPMy6CH3xkzyama/OxufXQzOOoct+8WCgH9ilZgJcFD2jDddYR4XOhYN86P 5TOTOFOjXCHbFFEk/G3S6QjUzs788g5706u2mSXKXtGxWDXy4jFYDwdJ8KNK/dqzvH9z JReg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:mime-version:date :delivered-to; bh=eTtLMoLXZG5RvJZtdOL9V1mGb/L1/Nr5iunuHXUVT3E=; fh=tIF3iGWwlQxrgCdXvKxWwva0qJFKzRDxSOgMIksgf2g=; b=UkUXHl6zV36WxIZMnTaCLFoUG5cnUiYptfpd7HzEKV7d3UInq08Q3BwEncFlZlZToN c+Wk4Du9Ok34tOY/I+MsaCUeLumJ37yhjiumMFWcsOoqm1kIrR3FgpjSjPAo42n1jY8h FOfu9GQS6msYCYQmpGP9QQwo3T2SZll9vW1u+bBWemR8PC2hbgHpg38Qzv/1xYWSAsjt yF8wCUDdGBoMMV4d3+5yjlLS6Hr7DL1I6vwrKWaucUlBKF5ulk3jYvJiJCgxAyORfi6X guHH2AovZYzjWyvOxKGWC6p3ymLD7bsI/q0AGLkl7J1DwKrN+ZhrOGbu6HCinlKt3TQr Gaug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-53b2e1adc16si70539e87.206.2024.10.24.18.54.41; Thu, 24 Oct 2024 18:54:42 -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; 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 4634A68DCF1; Fri, 25 Oct 2024 04:54:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA0DE68D557 for ; Fri, 25 Oct 2024 04:54:31 +0300 (EEST) Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-7ea750b5e87so1160054a12.1 for ; Thu, 24 Oct 2024 18:54:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729821270; x=1730426070; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0tal/MkcPkxQy+CJ5kBLzl2IfEZ/WXktnMqZbGKVMzE=; b=uOpyv6Gkc5+acBhKBtKQhraBrjpxET37w8qa0zizx7EA1ILnOLTggwbKZKD5/t2XZY EiAfD2TJBZVhRr+2jLbvvS0iAaee6NAWACFmHTBVMVU6P/BD7uScA5f8DLT/LDAAafx7 Qi8ReErzDYhtQ9SRLttr7bjtDALwP6ZlNHsx9CrvhvXQDmjVSifoxQQ/ECD9GQMwPIps OGhGEzmpMjkjnJXhZYsV8GW84ENcu4Z0MOWnHytSFt+zf5c8KrNbDCEXxXZy+rgnYC0N Ci6tR6jRjONvmWTNgHbLflKxm1hJFlC64wXcaZKzmQT7FqXoCbcasYTwApnbCqQxwmFx Gm1A== X-Gm-Message-State: AOJu0YwlRZ3uSSNieHC1X1jNSY4j1tCuFG5jOrmgYimDcdl7mLjOgfis KrHneAsPy9qX4UHd3pYZj5+XEY1f8+CMsqmbdjaDOldAyZsKrWV50YuceVxLuKpljkqAPZY5xTI KoOjlbEuyzdi3db70ujYjylVGxSgG2AlVAvsGkT3hE71XOt2mZHZLnHweqllqM5z7ztNUuAGc7C bVzDU0ADJVqpnDLDcU3a9mCIRQopSAygwQQWoAykx8ziU= X-Received: from ez-linux.bve.corp.google.com ([2620:15c:7d:6:9395:c059:9e68:f254]) (user=ezemtsov job=sendgmr) by 2002:a63:5b51:0:b0:7ea:10c9:27ed with SMTP id 41be03b00d2f7-7edb31ec612mr4666a12.1.1729821269367; Thu, 24 Oct 2024 18:54:29 -0700 (PDT) Date: Thu, 24 Oct 2024 18:54:10 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Message-ID: <20241025015410.36165-1-ezemtsov@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] Fix crash when trying to get a fragment time for a non-existing fragment X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Eugene Zemtsov via ffmpeg-devel From: Eugene Zemtsov Reply-To: FFmpeg development discussions and patches Cc: ezemtsov@google.com, Eugene Zemtsov , Dale Curtis Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: P8gM/aHY441s From: Eugene Zemtsov Bug: https://issues.chromium.org/issues/372994341 Change-Id: I695d625717c078ed6f84f44e58c34da858af4d3b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/5958151 Reviewed-by: Dale Curtis --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index b4390be44f..f213fd5b22 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1672,6 +1672,8 @@ static int64_t get_frag_time(AVFormatContext *s, AVStream *dst_st, // to fragments that referenced this stream in the sidx if (sc->has_sidx) { frag_stream_info = get_frag_stream_info(frag_index, index, sc->id); + if (!frag_stream_info) + return AV_NOPTS_VALUE; if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) return frag_stream_info->sidx_pts; if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE)