From patchwork Fri Oct 12 04:02:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 10649 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 8C7D44452EF for ; Fri, 12 Oct 2018 07:02:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C440468A3ED; Fri, 12 Oct 2018 07:01:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 975B8689A95 for ; Fri, 12 Oct 2018 07:01:50 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id j23-v6so5478031pfi.4 for ; Thu, 11 Oct 2018 21:02:13 -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=PidfEj5auJnHx3SG3NhADSYPWFv6zo+XKcSjjYEFBfg=; b=eRmJqKTIa7yj2fcpy2sQY8CDLn9w2hUW9E5DOCZv0Q09hKBLS/9jF7mb2DMJ7yrmI6 oLIwKyQxvKYNCGqyhrj8Zs/ZLrI2swaJhedFV4ytr5qWOahyVVcNyYN417CP4Rj+DMj7 hqfKaFHxpQrySNM6WYSJ9Kj5ZxyBqn5sECYyjs6lKruC9EdlfOJOdBzDOLqLJ2Z1dCbr 3a8lR8BuR4cddp5NGoI3moNF0dHyv7R5OshI4J6iCgTTNGNZFo8nqh9cG79b4bY4U+Tm msPJKatvxx3hlYFMBU6bgxsH71c8idcqnH7YmHxJHJ7TowZWYsQJya+/M6flPDjvvFZX VVkw== 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=PidfEj5auJnHx3SG3NhADSYPWFv6zo+XKcSjjYEFBfg=; b=KHoIyklh4W2p7YvmWDD5hDukPlUaRQBCEKMHlDZYKlhXr8ln4GqMFP7gfeQxF8BpbV 995XHhszQrnjI1H2M5Hk5tH7xczR7nUEMEmpVfqbcU+UbHrLOGfO+DUyp9O0i1YmtcAp auVc/8BwzILf4UQSBrvNAk3ejzqkWBA9n0IVIiOtWQtLmGjI7JVKpib2V6jukXFZVXOf hU9ZCPALgDydlX2aVWFmIBYPnM0oWdw+dMN7FYl+tAi07nwkW/YKveM/aMVU+Am3JDW0 rp+y/A6o4+6MJZYGnwfpkUvTf/sBt4y3dL+zFmM5o8yvQCtPyTLmZ2EQhyjl9PEd46gg l5jA== X-Gm-Message-State: ABuFfog/ZZEMnTC3ZBflPBFl1aD4cmk1qNAszh/cbiB9fz5yN3A5dPhu CU8qcjh76ylrJ38VcB7CepMxQ7lKxrQ= X-Google-Smtp-Source: ACcGV63+LFy6/7y/kjfQiBke1w/apELbGDAhstd4i6rwrq+OkMT55ran3uzFnvyzMyBWE+j8sxY8ig== X-Received: by 2002:a63:5f05:: with SMTP id t5-v6mr3887978pgb.352.1539316931904; Thu, 11 Oct 2018 21:02:11 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Oct 2018 21:02:11 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Oct 2018 21:02:01 -0700 Message-Id: <20181012040204.21579-2-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 2/5] avcodec/cbs_h2645: fix crash due to assert failure on empty nalu 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_h2645.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index ab33cdb69b..13e4c1561c 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -521,7 +521,8 @@ static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx, // Remove trailing zeroes. while (size > 0 && nal->data[size - 1] == 0) --size; - av_assert0(size > 0); + if (size == 0) + continue; data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE); if (!data)