From patchwork Mon Dec 6 04:45:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4096181iog; Sun, 5 Dec 2021 20:46:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDakam5xbbWQ3/FQlyJZkERu3vZOuD4fvNlmvjKV4HBFKukQwwyXC9H1XXN3t5FGR/mcX6 X-Received: by 2002:a17:906:794e:: with SMTP id l14mr12598250ejo.179.1638765984987; Sun, 05 Dec 2021 20:46:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638765984; cv=none; d=google.com; s=arc-20160816; b=yCyKmm+BX7qsSQQTZIk/403FxMGAMf22ILBXxOdf/D9lPMwUaxEUAyRVnM7vuGWQo0 vXIpuMmAwroTS2DxZ0pb6gph8FyfD9HZFtLfB2ljVgtRm+Rm0++gjACLZH6FEwn2hfye DnqOS/R/xG/bLsPsnOgXobSDr8DV30FJsvLQ10uXhW8VjpQ781J4auPCcCNdconAm6BG sCeA0iok7XZUY++J6fSyBHcuzlt9ZcjLgeCH404/Ob043yivr9+wOPHa5gSf5Dpv7Y/1 peLb5N1Z6N3OOVYSrfc1UzIFU93kAG9rCyLD7anQFxF/efczXLZ//EZgxYYbNk0hvdTm lqNQ== 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:cc: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:dkim-signature:delivered-to; bh=lU7W1HMZSI8FD3Db81SnIuMG3gTH+THOYZ//oTSN/uI=; b=fwUmQBAj6Lh5r8da2ED6J1VJxLWc7v3q+fkrYg91IVCGMXvkhQqXZ/W1BFH48+0kzI /le4B8/GYWqfCW8Sb6KbXgJ07auzEtMk9CwREqWa622Egsr2ng9mH2Ikj4uHERSSxZ3p KGIlAv11lwZh7m9N1s9vtLFRJc8pIYDInJSTripbp2/kXow8y23aPmoZ/xWGwCng2rF/ KZLw/lpRkEnTIQjC6Nepoizb9tyu5xOeTTl0l4BQBjNUMWa3MJHZ3BmE6ooSCQJiF6/6 DsBt/PJxTTvOzFKRyQGfpmRGPF1YzIkQ1PQ/k+cpFOGzppyv5ISbp/q+NjJfcJZ/vQfh q0lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ej08TrC1; 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 d11si17190592edn.463.2021.12.05.20.46.24; Sun, 05 Dec 2021 20:46:24 -0800 (PST) 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=20210112 header.b=ej08TrC1; 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 85EF768ACF5; Mon, 6 Dec 2021 06:45:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 045F168A92E for ; Mon, 6 Dec 2021 06:45:31 +0200 (EET) Received: by mail-pj1-f53.google.com with SMTP id np3so6757717pjb.4 for ; Sun, 05 Dec 2021 20:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=J8t8w6hVY7vaduZUzT75qBT/zrFeXAOAAipgzOgYhh4=; b=ej08TrC1ahSaWqxTK+FQlTHI4d9k5aM55OyW3HkbpKyvA/sGQEqab7lpdeGp1w2ip5 6feQlB1/h276jwPKcsbwOL7yPIRAALGYHcezfEkXpvhJTsYxPESCynLw3Wirqd16N3PV XevNg8oo1LfjCYFcBk/yWCV/s/6yf9DxoV1ARkiHu/AVEDLQOTRsLiEdrWu9nAEIJJ8z GGA9UfXj4W5Cw0RHv0E0NhC4gUm5FLQsNywRFcryEg9R7XceQvatacy4nhLYUrCqs9hE Q2gl5sU3fKI4ztbnsFILpOneXMoayWarNpraPCNdfQEZV3/R+Q8N4jK1bZQvZZP0+rCE 9hpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=J8t8w6hVY7vaduZUzT75qBT/zrFeXAOAAipgzOgYhh4=; b=R1er7P6LcKJ38wKPYeNePfIC+OG2MHBrJCMeSeRv2nC2F+dNujwPtx2ef57IW6Z0GV mQHMyToyREPlK+jgliV+7cmg9Z+t1RB6Qf0+Uj5F3svg7Cx1x0LANZGLGH3dElnaubua P+iR65mrzDHFAA2covzwgQ6FjVG19DjQI8xJgI0Rzd3ZO+3566VChDVOcOSWYXR9MSs5 WtzMtxBCQo0jzP3+NzHG/ANIKF/K3e8H6V0f6Z1jaQbfrRi2mGNPeS6aAAS7RfQ79rDA e06oP9RS2VWftwvSZ6usIlDva5qoPptraGJabSCAOdhQdD8dCwjf2QVs2cbzBnzuq+/f /WkQ== X-Gm-Message-State: AOAM530E2PJRVMKjNfyQegs++6MHliWnEKWg2vcAySYdgTGvEI4cQeqL wglhdMuA2tEeAGgnYDnm0BZ1yNwbnVc= X-Received: by 2002:a17:902:db01:b0:141:ea12:2176 with SMTP id m1-20020a170902db0100b00141ea122176mr41610316plx.44.1638765929326; Sun, 05 Dec 2021 20:45:29 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mn15sm8278289pjb.35.2021.12.05.20.45.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 20:45:29 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 12:45:04 +0800 Message-Id: <1638765904-2521-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638765904-2521-1-git-send-email-lance.lmwang@gmail.com> References: <1638714396-23062-1-git-send-email-lance.lmwang@gmail.com> <1638765904-2521-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 6/6] avformat/rtsp: fix the error code from ffurl_read_complete() 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ryUs6tsu/CxB From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 4ae810d..c591664 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1197,7 +1197,7 @@ start: ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1); av_log(s, AV_LOG_TRACE, "ret=%d c=%02x [%c]\n", ret, ch, ch); if (ret != 1) - return AVERROR_EOF; + return ret < 0 ? ret : AVERROR(EIO); if (ch == '\n') break; if (ch == '$' && q == buf) { @@ -1250,9 +1250,9 @@ start: content = av_malloc(content_length + 1); if (!content) return AVERROR(ENOMEM); - if (ffurl_read_complete(rt->rtsp_hd, content, content_length) != content_length) { + if ((ret = ffurl_read_complete(rt->rtsp_hd, content, content_length)) != content_length) { av_freep(&content); - return AVERROR(EIO); + return ret < 0 ? ret : AVERROR(EIO); } content[content_length] = '\0'; *content_ptr = content;