From patchwork Wed Nov 4 13:37:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23392 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 D1D6C449C3C for ; Wed, 4 Nov 2020 15:37:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAAB068B32D; Wed, 4 Nov 2020 15:37:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9BD968B588 for ; Wed, 4 Nov 2020 15:37:42 +0200 (EET) Received: by mail-pl1-f177.google.com with SMTP id u2so4357946pls.10 for ; Wed, 04 Nov 2020 05:37:42 -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; bh=c3zMXA1tGsoZl0iObBwgVqZw7Xh55m7Zx5xgN8EWKFk=; b=WJMadFtfT10plGC3Yy3KQBke+P+lVO1IwCZXRDlPK2c8jtoBTewzz96/it836chyrA 1/g5gC0qrZ78IoV1HdsxHwgxUjJ6s4giBQWy/wbZgyRmKVoxQ8Jt+YibuIV/xmzm342m xur0rL1q3Rfi/ci7BxHDmjmVqnLOpL4PKAxcWDVoqRa0Le/xcWXQugqdOS3WWsmqxm1E /3R6FAkPf2q/BALcbuOWM/1JdXBpLSqRnQRORfcAcIo+hboTzmmxKI7HHALFxdiweYmN /rrgLmHQsEtPeR2oSP1EC3GcQc4slwma4nVz/tSUSRLeUKe8S0/qwq7LTMr/vh/0YIDO 6upA== 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; bh=c3zMXA1tGsoZl0iObBwgVqZw7Xh55m7Zx5xgN8EWKFk=; b=P0yitSoxvRBge0IvAIk4fFGGQqY21lhdPFD3WtbInIixxzd29APrKwjkIG2NglD4cK Pwm317tA1PNgsTLMKUaOgQcKgAgIcAwKzRjgxnUX0J0tKiX9gKi/BgatVmnOtaU/FWKa aajLNTMf4tEEONKiUyNaszWCmxbExkjW2ubadrvajqZykZBs7sD8r5impoobzy+Va09c vuBXte+38zpWyuBizOkNrRRJd3TZt/FdS3pV2lpBVSKNia/eIR9FW7tJF1I6e6Biz4gG zcp62twJJ2Is9ApXKMp/1wi+1bSqo6wE9gFLph0N9J54Yn5KrvhS9PsOoudij7SP+bs7 uj3g== X-Gm-Message-State: AOAM5321xvKURqcIr+zyjP3tx/RC94Tfz9j6yjofzIiLBpcwBO4yTYcJ kDjWIC2i5wEhkidNPh5wqQZLUqXcs6I= X-Google-Smtp-Source: ABdhPJxZuqhwcQKrcOGXeV16PNHHhgQiSsRccH8lyywpcuOBOtgSwCepY6P2BPcISBsUIinX8rz3QQ== X-Received: by 2002:a17:902:bcc6:b029:d4:db82:4439 with SMTP id o6-20020a170902bcc6b02900d4db824439mr29581424pls.63.1604497060952; Wed, 04 Nov 2020 05:37:40 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id l22sm2644198pff.27.2020.11.04.05.37.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Nov 2020 05:37:40 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Nov 2020 21:37:27 +0800 Message-Id: <1604497047-30429-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1604497047-30429-1-git-send-email-lance.lmwang@gmail.com> References: <1604497047-30429-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/6] avformat/rtspdec: return proper error code 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtspdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 3abf34b..a4cd1f6 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -768,7 +768,7 @@ redo: } ret = ffurl_read_complete(rt->rtsp_hd, buf, 3); if (ret != 3) - return -1; + return AVERROR(EIO); id = buf[0]; len = AV_RB16(buf + 1); av_log(s, AV_LOG_TRACE, "id=%d len=%d\n", id, len); @@ -777,10 +777,10 @@ redo: /* get the data */ ret = ffurl_read_complete(rt->rtsp_hd, buf, len); if (ret != len) - return -1; + return AVERROR(EIO); if (rt->transport == RTSP_TRANSPORT_RDT && - ff_rdt_parse_header(buf, len, &id, NULL, NULL, NULL, NULL) < 0) - return -1; + (ret = ff_rdt_parse_header(buf, len, &id, NULL, NULL, NULL, NULL)) < 0) + return ret; /* find the matching stream */ for (i = 0; i < rt->nb_rtsp_streams; i++) {