From patchwork Tue May 18 21:39:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp788806iof; Tue, 18 May 2021 14:46:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+33cr8hoQE1kmsOX2q5aq/4vzV8Yc0/qC4NeAeKnpcXppsGXSiikiCuiJN7BaBW6rk5+i X-Received: by 2002:a17:907:105e:: with SMTP id oy30mr8171673ejb.258.1621374375653; Tue, 18 May 2021 14:46:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621374375; cv=none; d=google.com; s=arc-20160816; b=YjIziQUuljX9428y/UwpEuWm3kRr83JRGVFQqVv8MNe1HoniLyzFJXPYOWTsj3oGRO PtAzq0j3/ujpQ5ZihbI1j0feVycwLn6rLihUnoBF8F3wwKSb8nPord13cM5lR8M+8QAK VLqWNKVShI/k6vLFidXUVnvDdwPX/gc/VQSbC0NGIF3Ct+2wiKJn25Vtx+tEmWxOX4Ai 6OFs8WslZYdX/fUardhnq30KBflKaX2R/I/BgS5zswmxKBGS13jjCHZ+7/ClcRRLacJT VfrGuay+AdrR6Zai4Wt52s7MMFksPXbUZUAGILrqnbS9JXLhpSsKgAW5U0sLdwRNLExR X9bw== 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:message-id:date:to:from:delivered-to; bh=hRCCqrAsCyn/BEHi6vYEUfj9hL9xmgs5CKC/aBFCqNg=; b=SHyQdhZxjxSCIXeMiqoedtmT/GY3wSToLHbSCbEvrgCaj+ZvJj7bjx5juAur9wRoLV sjqaVrtt1/T8x8ZJf5tU+FGyvkOIf/pkXnZCaslZJ1CxUgD5zE6U42zdo5bCRiBxTNC3 Mxw890Wu1RbLhnq3zAcm8qz1uHfj9O2/vjaMCW6tBifT0h3/1C4auewhQOia3i7TKl1H 9tSdor4SLwlkJUUoMzbF/qaZoKIUVtwahzux56snqk4kG94vTGPWfObhfGB/zR6DYEuP acPU1mYRMy3Et5gMrFsVXdnQvRYKNWz16S03YZaR1GUMiOTbMX6KELyYShBVSJUPoPcc SyxQ== 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 rk28si15872954ejb.184.2021.05.18.14.46.15; Tue, 18 May 2021 14:46:15 -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 906AA689C54; Wed, 19 May 2021 00:46:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24735689A52 for ; Wed, 19 May 2021 00:46:06 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lj7Rj-005XwM-0C 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 j7QklA9zyljeHj7QklkEg8; Tue, 18 May 2021 23:39:10 +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=nexil9BCcO3qCMUjbOwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 18 May 2021 23:39:08 +0200 Message-Id: <20210518213910.28732-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfHwc8vCN2E6u4Pryy2+XQQSNcCHtUIM93fd6vCavgNo/DKw9Idm8KP3uIBR0apjcszyrgghIZoWYJrHludSJfBR6NMSmZWgc0IirtJhEef5Cnq1VQsgs VKHtlYXcOOcAybN04XSrodMpxNwvRkYcgVZCaZm0fLYdy+vZeZmztHbh Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/avfiltergraph: Remove NULL checks after dereferences 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: PMtWT9B+c15w Fixes: CID1398579 Dereference before null check Signed-off-by: Michael Niedermayer --- libavfilter/avfiltergraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index ed54d3dc11..5389d82d9f 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -1360,8 +1360,8 @@ int avfilter_graph_request_oldest(AVFilterGraph *graph) if (r != AVERROR_EOF) break; av_log(oldest->dst, AV_LOG_DEBUG, "EOF on sink link %s:%s.\n", - oldest->dst ? oldest->dst->name : "unknown", - oldest->dstpad ? oldest->dstpad->name : "unknown"); + oldest->dst->name, + oldest->dstpad->name); /* EOF: remove the link from the heap */ if (oldest->age_index < --graph->sink_links_count) heap_bubble_down(graph, graph->sink_links[graph->sink_links_count], 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; From patchwork Tue May 18 21:39:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27835 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp789214iof; Tue, 18 May 2021 14:46:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/9aQpvN7HhKjQMoepYUbS88bmY1lS5p6uSN+fyYK9IuJrXNMQyA65+jru3nCA6rdYk5Zf X-Received: by 2002:aa7:cad4:: with SMTP id l20mr9445669edt.382.1621374411223; Tue, 18 May 2021 14:46:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621374411; cv=none; d=google.com; s=arc-20160816; b=Bf8EvuKLYxkachGSrSJPz+heQoPQpyocKuII8PJHtHbmMMUw4ewn9m1ITiyZ89g8Zq qm4LYy2WmtBrV7A5Rj6KU7aNxGMnt1P1CzV9uQgPxYMEiwuR5w5uAIODFbcMhyNFpPjS JK6QrYYZ1gVlVAuSQ7Gz3yOHhXLrtopgzPsnMVfGuI6IRUAnEPDBsMhdTVZEPPI189TR laQbhtpAnM3iHpuAYavNOFvaYyfxx1jzu6J8NMjWMiO6vi1EHm2vEk/jHpyuISIHq4+C mY12hwe1fsf865wu/ID/nTmz+xFwd+JXJ46HZyAIxjyNOReYWGyMigrtbEd5uIDcvXoS PxCw== 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=LUytrCO8lcl7Gd0t4Ppk8X/roUxY+KWvsjfoNBWi9ak=; b=d/ff46/r3sI9hoR4RUtcpxAUzJwrbxhDosqdKPWtnK63Eq7jzcyaLtXI3PSAdtDK27 qsNZC7GqR8sAuzORf3UriUFHx6S9F91ShHpiu85a1PgAEyR3tL5pqW0jHSJie6lEUgyK 2qL64lrS35qlu2aIBNMy1tKLL6tdl33vxtPprQIVs67UXLFsaO3qKS6D+eXlCzooYoBO CZR8JKf6gEYsScxdUHp+HGFbbKHdqCpE3YBgcmYZVbpYlCoOHiLV3+pr2EXJtkUPLvff 2D1NKr1BJzDdFq/wALLSKekC4V6vYxOTapxC4OovcRdL3TON5EO/3llLMW+k+EU7PSTM M+MQ== 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 g9si18212433ejt.82.2021.05.18.14.46.50; Tue, 18 May 2021 14:46:51 -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 AEEBD689ADE; Wed, 19 May 2021 00:46:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDC33689ADE for ; Wed, 19 May 2021 00:46:41 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lj7Rj-005XwN-0C 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 j7QllAA0oljeHj7QllkEgL; 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=KabnVaPWALpb601x08MA: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:10 +0200 Message-Id: <20210518213910.28732-3-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 3/3] avcodec/j2kenc: 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: y49DTSGB1B6n Fixes: CID1466601 Dereference null return value Signed-off-by: Michael Niedermayer --- libavcodec/j2kenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 82ad3284b5..2ebef53388 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1681,7 +1681,7 @@ static int parse_layer_rates(Jpeg2000EncoderContext *s) } token = av_strtok(s->lr_str, ",", &saveptr); - if (rate = strtol(token, NULL, 10)) { + if (token && (rate = strtol(token, NULL, 10))) { s->layer_rates[0] = rate <= 1 ? 0:rate; nlayers++; } else {