From patchwork Mon Oct 12 20:36:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 22877 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 A02CC44AFE6 for ; Mon, 12 Oct 2020 23:36:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8753268BBDD; Mon, 12 Oct 2020 23:36:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A67168BBD9 for ; Mon, 12 Oct 2020 23:36:51 +0300 (EEST) Received: by mail-qk1-f196.google.com with SMTP id 140so17160197qko.2 for ; Mon, 12 Oct 2020 13:36:51 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=bEXbmel9v8DBZodwZqloGujldFG8Ju4I8Lm+kj3Y/p4=; b=TLnfLtfVBFqow9NB+f92BAYIxIzACW+4tsTACshYEK6gUR3zDmoft8NZoOJr7k5YyZ BU8DNB2Ajz5CBVMSNFCBKAxBtV+ncCEnU1/ddSh+GXqgouqUqyXDJ+V7NN5TfpiIKXTT Srr5ts55V9KjOoQjUBUZyyP0NAYiS8DeNq+kxv/Snqd5f873cFzVRisNMI3E0/2rVWKn D8B8aDeNNEuHS7Y8RaZl/336UN2EJFR76KK9bBKY/EvkXsvwQN0cZqBq3QHzFifSUZCE cnGD+QDDQyKGxLGePX2IHpHjoCHYDsUQ8AxK7iLPg/acIOAURRep9MagiayZNeoQXSWx ZgLA== 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:mime-version:content-transfer-encoding; bh=bEXbmel9v8DBZodwZqloGujldFG8Ju4I8Lm+kj3Y/p4=; b=CyvRqPNonRhb5S9NoKI/l6SjEh6xjWODhQOCTvZrNvn4PowebG86DbBy7eb9efxM/7 riAbK4AvRXAiPguzLN5S4jdLtjJCh6P0KwwedX1tLmVhzs8Sj70mpOXJcgsQg3Zj47yD 9Oeq1YxQhVd6sJeui6qQI+d9thnPgyykvi4XkC4oA7fFRKQMXUFdNg8717dnN5eIcd2r PbBGhEXh2MxSce70SbFUK0gpdKGL92gEqGkgUYZtJd3xcLw2soKHaWiz6EjXbuUWoAy3 3+3FsUvQ3PICX8N16mXgC6GNmxjmwtEy9uSqqO8VWRRdu8fzk8js0ZJoWDfRssHjoAvr 2KUw== X-Gm-Message-State: AOAM5306RfapetvV1J16TCFJ43m42SShj8lMe7NhdrvXWmM0TGbLkeK7 QaahuuguwthF4drAkYvaVh6Xs8EQ5dc= X-Google-Smtp-Source: ABdhPJxMpO8WNsYXBLqo4QMT8PetDjgmhXraMoqZ8AoemMhfgt9oC4KG2jYEJhMgqJbciezFLIkQ+A== X-Received: by 2002:a05:620a:4156:: with SMTP id k22mr11003940qko.441.1602535010528; Mon, 12 Oct 2020 13:36:50 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id p38sm13521826qtb.20.2020.10.12.13.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 13:36:50 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Oct 2020 16:36:08 -0400 Message-Id: <20201012203609.41647-5-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012203609.41647-1-andriy.gelman@gmail.com> References: <20201012203609.41647-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 5/6] avformat/rtsp: set return variable in error path 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman In this error path ret still stores the number of bytes read in ffurl_read(). Signed-off-by: Andriy Gelman --- libavformat/rtsp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index e9fca034b4..cb9fc31166 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2503,6 +2503,7 @@ static int rtp_read_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Unable to receive RTP payload type %d " "without an SDP file describing it\n", payload_type); + ret = AVERROR_INVALIDDATA; goto fail; } if (par->codec_type != AVMEDIA_TYPE_DATA) {