From patchwork Thu Apr 18 09:00:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: renwei X-Patchwork-Id: 48134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ce4e:b0:1a9:af23:56c1 with SMTP id id14csp1551223pzb; Thu, 18 Apr 2024 02:00:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV/Kx8AxYhVqDiZKt2fQy8d7J67rHkCCQw10QuQEy5EQZVPEHUn8/SqxNDzyHPwIvmSeGovyXiCnbot2Rw/4+VlV6BuFQMf86EsUA== X-Google-Smtp-Source: AGHT+IG4ITb+LtTasCF/Q2CDf+KbLAgisMu43HJCjyQNH5DyWssyK+X6QscZn3VMIf4D4pqhaQUY X-Received: by 2002:a05:6512:3b22:b0:517:5434:5345 with SMTP id f34-20020a0565123b2200b0051754345345mr1402331lfv.2.1713430834224; Thu, 18 Apr 2024 02:00:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713430834; cv=none; d=google.com; s=arc-20160816; b=Gr3hNIx5JHfUXOxoQTF7Gm0AmiLe5l9u9YT3ak07NT0uAWWM/sh2LyAnEvQFRMaP0b MSPRoIQ2t4PwvW7ylwW5PPCsazCnA3ol1Eb2p04NkpjU16FR5jWcHcIMtFCtlWbkILwk KLStUElpuzr4VIz22cz8S2cK6Sqkj5U9ZiX2h+68QafTGKeBaDtE2PXUarcWWAr0+zeK qV/oIV0lSr9EGmckbxryj76hEHWR7yfCuFldz2Ts8OY6JKTk8+hdf4OGGJQsrzAZJZUJ 7UQVLYBge52QbW2mmGDOqSrb3I3qcMHTsbEH5SV/j1xqCLCy/Y8CdRNv4E/y2YnBLXln 3vSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=2v0sq+eoStoYj+3c/PE/hvJm24F17lxM+Z89gCo6pHc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Dee3VRvOP7dhQ4zpfUzztcl74btQexwgsvpr7NTl/xTBvWkfGdK6t3KVhauG5VyqRa YYLOog345FgMkh3H4w2NKEw+07zPcwmIPDl0Nq2IEnV262hZI/CIyPSp7lsQwfBSKsI7 4j1pvsnaDyo0YMRcE7Yw6sMGyqnwWpUdaWBuAdDsFXI9808lNJpiEneio5EkgLjTMeRz v3m0WlFPpnpjRrTGI5aeHjlZSpK0ENwpqv8VWCzKm9rATk4bgcA7P22dPof5Wo+f0Qmn lRAjThEeIfRuL9hfdAOoNxHjv16J+CyolDdfoxgl/LU3XlsqkauZfejRwTfFbrABw+A9 5O9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="iX/xRIIR"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kl4-20020a170907994400b00a54d3a8cd4csi616134ejc.586.2024.04.18.02.00.33; Thu, 18 Apr 2024 02:00:34 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="iX/xRIIR"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2E3B68D417; Thu, 18 Apr 2024 12:00:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f46.google.com (mail-oa1-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B98568D3FE for ; Thu, 18 Apr 2024 12:00:24 +0300 (EEST) Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-23333ef4a02so446270fac.1 for ; Thu, 18 Apr 2024 02:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713430822; x=1714035622; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=gZ4VKaTEkb2Mo1o/YrRuZuWf7pNurX7t5aT4c33T5f4=; b=iX/xRIIRZX+WGURP8G+LKPAHK/LRFMNBKblSIwK8jgJ0VoccuamhVDjBG0bQYUNcj7 OIXIXnn2c5jdccPe2Oh63dXV3xNPpOWKoG9iJ9E66T8O5j4Vu7S1gGtImgVNvYqAHsD1 ydDWh7N/SLR+NOBoyLFyuj3OfP1cOUBEhNutPidwiCmgGhux2RHlGW4Fivs+S0DzGtZM jTulg8aUY0xsVjGqFzZ1ZS57hXs/ObL2rjldcNOCy9xDbtTJRo5UHlaLBlMy95SPlhG7 d0D1dJ5ZydqAfgiJdn9/m/jia4rf4DYHLanTFpKmCifiwR6WUe4UlRSehK92IzXoap57 6PqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713430822; x=1714035622; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gZ4VKaTEkb2Mo1o/YrRuZuWf7pNurX7t5aT4c33T5f4=; b=R5q+GvFGypA0JEO/Bj5VHPbYqkt+qAa08EFrrcQqMwzU87bDMxThMF31f7NuVX43rK jlC5qt/GzfaHLu7eYaBzM2Dvn8P4ZtEtS247xv1WUIEFY9WbXbiXCQ5EsSOcX1hrM2Tm x85Jxf5a4FDoPPAZPUHIbDckpj/HXi8ei3I1Tg2DXWqhHd3nd4H5awmC7YSUf9igLRHX 7InFcP2ZxWLjexSDkpLrzmlJDgvvxZDpRtQeXZ6bnHvdERUP/K8c4EiarL87Jr043JWc p8LCJKFpSDLw4DtMtOoTEcrHDjv/T1jeVJqTu8Cs4wgb7jKTr8p1dgiZqvVSOS91ijVM ODLg== X-Gm-Message-State: AOJu0YzFUFRnLiLFzfUXJEGCVvi52RHF10v657TCf3al06qBlfq6wcNb 4H5hZOvD7NKLnFVE/6A63u9uVbpyLwo8M2tcr3/RVC7u33X6ZTue5MnLMg== X-Received: by 2002:a05:6870:c10f:b0:229:e422:4ff9 with SMTP id f15-20020a056870c10f00b00229e4224ff9mr2713039oad.18.1713430822157; Thu, 18 Apr 2024 02:00:22 -0700 (PDT) Received: from H1466QVTPY.xiaohongshu.sh ([209.9.115.74]) by smtp.gmail.com with ESMTPSA id m6-20020a62f206000000b006ea80883ce3sm991514pfh.133.2024.04.18.02.00.20 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 18 Apr 2024 02:00:20 -0700 (PDT) From: renwei To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Apr 2024 17:00:17 +0800 Message-Id: <20240418090017.60314-1-renw1991@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/http: return error when error occurs during gzip inflating 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6LPJ58ru8QBl when there is error in http gizp data, return 0 will cause endless and meanningless loop in retry_transfer_wrapper function. --- libavformat/http.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index ed20359552..6e712383c1 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1657,10 +1657,11 @@ static int http_buf_read_compressed(URLContext *h, uint8_t *buf, int size) s->inflate_stream.next_out = buf; ret = inflate(&s->inflate_stream, Z_SYNC_FLUSH); - if (ret != Z_OK && ret != Z_STREAM_END) - av_log(h, AV_LOG_WARNING, "inflate return value: %d, %s\n", + if (ret != Z_OK && ret != Z_STREAM_END) { + av_log(h, AV_LOG_WARNING, "inflate return value: %d, %s\n", ret, s->inflate_stream.msg); - + return AVERROR(EIO); + } return size - s->inflate_stream.avail_out; } #endif /* CONFIG_ZLIB */