From patchwork Tue May 18 21:39:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27833 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp784925iof; Tue, 18 May 2021 14:40:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9wf8wjIX1txwTmlIpa4Zlj32ePjpUIoGW32NYYsORXGevxAF8oxLp9wD0DtfRPtivgqk0 X-Received: by 2002:a17:906:268c:: with SMTP id t12mr7997453ejc.441.1621374020264; Tue, 18 May 2021 14:40:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621374020; cv=none; d=google.com; s=arc-20160816; b=RvaXTLmD9mx2VMKCtyR3R1h0jIreZw82pVm5uXp5XglXgMv1GI8kD0sJT3aU6TzRr+ pTgQcXXAdJWWAXbYJtyH5qgOYuMjgXPUujf3GL8FRSGbqHCt0ljxqvj8nkzwVhH+zGu5 TdAUz0C/0+9GcbuwDm/yp47HLc39957sBYF8KlxkqTXJ65tPbepu5e0Ru4QTVuRmKV62 /yOg7ziNC4cnjzhMxMHYsNskiMC9IoIOHHHQEBfBK4PLgIU9MRHWijnp/r1Kn4ZsqgbS zGpjgqFfifp5aoswziU0vT5sRoMYxGS2DRSM46Rq6/bM3IieMRztF+3pdnjrQ1ywES9L TfLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=uy0SPNu1jGbOBlx63SjbV3jb2LzjBP1rfFUUSx5TbsQ=; b=YdSlwMZd7qopv6rExs1QAHPAOT+DTGnK5QcrpD2Lk15ceXjj5yu/iHr4tPtLX7XfyN HO2FWputyDB4h9wb94rRdFaMQkIXArf0tS6bGLlgdnentTAs0yKZrK/3SoB3A/kJKePp Imtn2uzkMpu6p+DuLOTvH2XtTlGXZ4/YTQpyTQUvmtmkh2xgAajuZzrfGiOb0A46GK6G otp9NHq6EEAVhuIto4pAWTdsvBD6MFLetALVFdwuDsYrXeFzE38ZXxILfu8I77qfgjuD pYXmijTmgJ/pikdAJ658I33WNzgd+hrvVEXxK5s8jTo2fzJZ5tmAc6je1vl8kk6cufcD 881Q== 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 gq23si14621653ejb.429.2021.05.18.14.40.19; Tue, 18 May 2021 14:40:20 -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 BC558689C0A; Wed, 19 May 2021 00:40:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7786D689922 for ; Wed, 19 May 2021 00:40:11 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lj7Rj-0025hW-0G for ffmpeg-devel@ffmpeg.org; Tue, 18 May 2021 23:40:11 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id j7QllAA0eljeHj7QllkEgI; Tue, 18 May 2021 23:39:11 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=AQBON57ueddxUIxLptgA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 18 May 2021 23:39:09 +0200 Message-Id: <20210518213910.28732-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210518213910.28732-1-michael@niedermayer.cc> References: <20210518213910.28732-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHwc8vCN2E6u4Pryy2+XQQSNcCHtUIM93fd6vCavgNo/DKw9Idm8KP3uIBR0apjcszyrgghIZoWYJrHludSJfBR6NMSmZWgc0IirtJhEef5Cnq1VQsgs VKHtlYXcOOcAybN04XSrodMpxNwvRkYcgVZCaZm0fLYdy+vZeZmztHbh Subject: [FFmpeg-devel] [PATCH 2/3] avformat/ftp: Check for av_strtok() failure 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: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jBBJODpBfh2L Fixes: CID1396258 Dereference null return value Signed-off-by: Michael Niedermayer --- libavformat/ftp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/ftp.c b/libavformat/ftp.c index caeea42920..69caa7670c 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -972,6 +972,8 @@ static int ftp_parse_entry_mlsd(char *mlsd, AVIODirEntry *next) continue; } fact = av_strtok(fact, "=", &value); + if (!fact) + continue; if (!av_strcasecmp(fact, "type")) { if (!av_strcasecmp(value, "cdir") || !av_strcasecmp(value, "pdir")) return 1;