From patchwork Sun Feb 14 23:20:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25628 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 F0E2F44BD5B for ; Mon, 15 Feb 2021 01:20:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C3775689FB4; Mon, 15 Feb 2021 01:20:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE9FC689E14 for ; Mon, 15 Feb 2021 01:20:51 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id t15so6922107wrx.13 for ; Sun, 14 Feb 2021 15:20:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QUzei4LyqgUk1P4qij7Hwa45emgV7k0yun3MpG5z7as=; b=YsE2JBzSjB5B2VDUAxUuFurYdoBk03jSAhAcQAuPSYHB5CaLjsqz+vwIweQO74b8yJ wVcYSUaV3Ayb0Ars9FOtarVlSi9Kp8Xb132nqYUE6/KBQ3DNo7upaRYYgq7nQOKdA53n FkMPIWvzfjAwamxaOqGDi6Y/8aYbm9P2mUcMt0timdOtERf+bZw4CX+CauX4qpKgz5zC WQsRAs57A8w7ovqxVFT99faecfnHJ8o29vT0294OH/XD6XcqQ7tgQiJB/UeJdoPdL+R7 W75effM5UqpQ6jpSylfZfGbZH1sbAvndyeSikBf9nJzKm7q9MnTXVGUlBBrY/im5/Rhi yKaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QUzei4LyqgUk1P4qij7Hwa45emgV7k0yun3MpG5z7as=; b=j9PJYHar654YaMkxg8ZtV3E3Y0ZQuDYCsp3v7v07i6F0y+vhlAnbfHo3ofLWWSV4wO Lzd8LnriaHK5Ehlg5bXnIoLudujiQwK2TodFEVuNYXGhb2ufLr73kTM+ne15RYhf74vs bqr9m3jVE+jBudXAzdtGSBj06rRU9n0N7S2gchtTJxA3VpLpHdrTfKE8AvrruUJ6ppdt KD99MR2Y9VL6OvqOtoH7JGM7PnVEWcFz3baqDP/ZzBlviYqxr78SRfKQ+xnq9Aj/cHaM 7DogLpT3Obl/mb1PMaB/zH5ecOGuiaDQ/sa5UUXYo2iqmqZTcxQbxysqr1mu4s3BPJzL ZbqA== X-Gm-Message-State: AOAM532Z5V14Xzg3d+G0ajT8MnFbjgVBILe7hpdUGrYA3kxm44QvcdSr tJruiaAK0vTUnstNkfntUG4U9kz0RKk= X-Google-Smtp-Source: ABdhPJxfzub9RCB/IM5vira+ThtiSldQplpelTkWGveK7mWhZMTHmaZGPdQu/+wpRsqbkmxkmf01WA== X-Received: by 2002:adf:ec89:: with SMTP id z9mr15834702wrn.410.1613344850953; Sun, 14 Feb 2021 15:20:50 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id f8sm20981783wrp.65.2021.02.14.15.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Feb 2021 15:20:50 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Feb 2021 00:20:42 +0100 Message-Id: <20210214232043.431998-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/utils: Add av_assert1 to preclude NULL + len, len != 0 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: James Almer , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Such a scenario is undefined behaviour and would also indicate a bug in our code. Suggested-by: James Almer Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index cea6d4ca92..652758e98e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1426,6 +1426,7 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, pkt->pts = pkt->dts = AV_NOPTS_VALUE; pkt->pos = -1; /* increment read pointer */ + av_assert1(data || !len); data = len ? data + len : data; size -= len;