From patchwork Fri Oct 12 04:02:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 10648 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 800354452EF for ; Fri, 12 Oct 2018 07:02:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8F8F68A4CF; Fri, 12 Oct 2018 07:02:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53FEC68A43C for ; Fri, 12 Oct 2018 07:01:54 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id y18-v6so5193598pge.0 for ; Thu, 11 Oct 2018 21:02:17 -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:in-reply-to:references; bh=EJRe4shJ2ehAcuM4QJzvYbKqDhBo9YYXiiv1QWWdPj0=; b=sogGO4HesmhsN/aeiPST1mtyV3a5O4GG5dLsvKKlKzllN+wAS0In48oOBuxLtMqEFL Ng2f47o74/Iboup/UuAWBR5A0EoA7AaCV6xkYPyJSxLRAfc3VYb6n4GXOEaMWHfwI693 mfpdoc46czEaYeCkOwz4j/5qJweXypUcLtL+nVHRMOzS9lBw+1BY/31rz8YLSZ8Te0A5 aFJTEeNz2watXVxL2v3Slyu8LH288pG1b0khSM2xDbmXVOWphTohIg9a8LMfTM33Kizu 2OHASSIBxuEFCTpp87mGIcrr5jDWihhWaemU7xKHgiWhFqbmb21iEks1pIXB4LEop4dT 77Lg== 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 :in-reply-to:references; bh=EJRe4shJ2ehAcuM4QJzvYbKqDhBo9YYXiiv1QWWdPj0=; b=l6bi1S1mJtXoe6kXXkItkxmRGfFmLdfqH8bL0urwY7tdmpeNsq3Eb+iju9lrSrXo9W 6rT7u7Cq4+FhW9BrhzN/F/LGgNsWkjbgsZqEQc+abHHxu8vmtNmuZhiG2FPkb6ySyO8s wInecb/C5Jaeeb384a5OGYOFOqmuVZllWzXaBudfhkfxjcNzTgsTvIZKljSn6PdrMybK mDTUgWfa4jitUl3Rkh1tGv7X9LxqyeeBKK6qtJNgcfNsBffWyvkWwdepOQpCCpgPPw7o 8R26LzZkLH1ROnDvp0oMsQRDXbdJkenxmSgn2b78OprQHb4Z6SEDCbEw7Yo3nY/Fukxb ykhg== X-Gm-Message-State: ABuFfohlF/tTBZ7oscd8komQ+C/YgxkmXJJEhE7tQXZkhmGRGluy0OZ9 FPcXYk2FP35OHLx++DJE6xaj1jkwUgg= X-Google-Smtp-Source: ACcGV63RkqmhoUvs5qQ+oT6SES/Wqks5ZvGY4x/RiEQ2yCDh1P8Q3oFNDhA2hcG5cej3xNUAFsuy3w== X-Received: by 2002:a65:4385:: with SMTP id m5-v6mr3743511pgp.219.1539316935741; Thu, 11 Oct 2018 21:02:15 -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 p62-v6sm43481502pfp.111.2018.10.11.21.02.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Oct 2018 21:02:14 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Oct 2018 21:02:03 -0700 Message-Id: <20181012040204.21579-4-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) In-Reply-To: <20181012040204.21579-1-ffmpeg@tmm1.net> References: <20181012040204.21579-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/cbs: fix crash in sei_pic_timestamp 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 Signed-off-by: Aman Gupta --- libavcodec/cbs_h264_syntax_template.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 32e6acd68e..106da0630e 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -584,6 +584,12 @@ static int FUNC(sei_pic_timestamp)(CodedBitstreamContext *ctx, RWContext *rw, } sps = h264->active_sps; + if (!sps) { + av_log(ctx->log_ctx, AV_LOG_ERROR, + "No active SPS for pic_timestamp.\n"); + return AVERROR_INVALIDDATA; + } + if (sps->vui.nal_hrd_parameters_present_flag) time_offset_length = sps->vui.nal_hrd_parameters.time_offset_length; else if (sps->vui.vcl_hrd_parameters_present_flag)