From patchwork Wed Feb 24 11:53:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25957 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 B39F744B5C7 for ; Wed, 24 Feb 2021 13:54:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FA2268A957; Wed, 24 Feb 2021 13:54:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9298568A27A for ; Wed, 24 Feb 2021 13:54:23 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id d11so1606149wrj.7 for ; Wed, 24 Feb 2021 03:54:23 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=8lKxVRQaoC1TasHVpxQCZAyQdBvPqIjhfPBcT5vl2og=; b=JkBvOeF4n9DTwYGN1qGslaDu+yDDTT+i/NF6Xdto0AEoXEzd4ZNPazDNQbQeiXzG4e DWE22m0qtyBP301LW3UtrE2mccoWm4UYkK379bOYIzbEIH7a6zQafBS4yqUQpFawBEaa 2JOTa6b3rpRXZXaRPe4wCT2MjUGMJgEQHgHBA0GCevrYP0ogWlBlF0Qg2D8/V02Tylu0 RK3fZqPWbDcB3K4HES30fi7Atzz4FeG9uRd8PHVivEguBmjXw8WddqocPIn+NAN7sxpD 9OygbMt3hW5eegD2IHSHivaIHM9VJlZeAJoKlPeAaxi/ZU8LS+oKMGeUnCiTXCDsvIH/ lSiw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=8lKxVRQaoC1TasHVpxQCZAyQdBvPqIjhfPBcT5vl2og=; b=B7JXPLgfbsY0IiIIXtDFFmbAwoGmh741f60Z1TP66SHvdnamszNFmYYdZBfc2ar0Kv 9px6ohy67REDEzHcBFTK4hrmIscKxtVRgNV+8+7DBoROBJHgiYakGqdOBhmFdnsxxd7+ 0rT2KOqPysZIP2zHn0YDh2BGyg+EMPJCbt7EvLctIvIbymoD8lCvyft6FB5Ppb8YEamf sHkwYBYq1Chum2a+zJFElAKQdGSZni+mq+6KabfPRL7c4CeMjRX59ZurlfS38r7DMpRL quoWC9/BPddIP2eSneiTaAu820FF/DI7u0s/5q7kqD2Cl47DIzW+NuykpEubBswvHXPA 9k9w== X-Gm-Message-State: AOAM531YYJnXTBF8umhZjYKHBvAPG8St8IW3FLKYjzZUfHv44HWMGmeK a+ZApBFeeDBqGkvQfQMXMLAxfIQGeQc= X-Google-Smtp-Source: ABdhPJyzf7x8agyXj5gs85retQGt5zTkR/aflCv54rpQeJiOdpMfSLpRtfj/+ymE6RU1zq795giMaQ== X-Received: by 2002:adf:b611:: with SMTP id f17mr30485445wre.8.1614167662821; Wed, 24 Feb 2021 03:54:22 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k15sm3911776wrn.0.2021.02.24.03.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:54:22 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Feb 2021 12:53:32 +0100 Message-Id: <20210224115341.794293-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> References: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/15] avformat/pcmdec: Fix NULL + 1 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It is undefined behaviour. Signed-off-by: Andreas Rheinhardt --- libavformat/pcmdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index e65b535665..395d9ecf92 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -57,8 +57,9 @@ static int pcm_read_header(AVFormatContext *s) len = strlen(mime_type); while (options < mime_type + len) { options = strstr(options, ";"); - if (!options++) + if (!options) break; + options++; if (!rate) sscanf(options, " rate=%d", &rate); if (!channels)