From patchwork Wed Sep 18 20:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 15145 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 97340448110 for ; Wed, 18 Sep 2019 23:42:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 747F6680026; Wed, 18 Sep 2019 23:42:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CC8A689CC3 for ; Wed, 18 Sep 2019 23:42:24 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id r3so780094wrj.6 for ; Wed, 18 Sep 2019 13:42:24 -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:mime-version :content-transfer-encoding; bh=2JdiifrePPPBzRR/Yqonclkp1z7vppny/AVWQRLUJDU=; b=R2V/9ZkmYmRcuwFFJoHlkywlzz1TSRjDtZI+pV4rYegrPG2s0v5hskZMGxH6jIpUve 5dgkiaqrNOxV1G7quzoILBnud8MrfDg37NcdD5YQuV5TKvg7jKhh2k9sEZjphfkw3wtl 4e49e69z0aH9JNWRh7HJNGN9reqzicLlbaWblJRONqdnOxiwn0k0AmS1y6bQZWjk6raC yznv6qau+V8dSxSpyofWAmoF1Ay819SqP8zo6tW7WZkzB1LIQsKSCTN88Hap7JBBYyCF WaO3MqOg9hkF+KJ6cEVc+y6daNfKX05CEWO1v6GjQ8bDWPgry5rNVcvoCspV0OKt9xKf HO1g== 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:mime-version :content-transfer-encoding; bh=2JdiifrePPPBzRR/Yqonclkp1z7vppny/AVWQRLUJDU=; b=dVDfsKMwIpFiraUrZHOU3cgdqvyiLHnkG3FE7S4Pd1uLai+wV8dLM2HvSszGomaIw8 WmDGFc6+cRVUzShEEeQa1yy5p4OECqVTjpLQZAN9dDhvJIBPTsKR+bBmnQxSrlU/As6S eE20I1TCKWNAfskcL0oYjpJHsfwlbjEBKePBVUhr6i8DkJaVbTZSgGMRM3gvtk7S/0d+ 2Nm4kSfxL7WcRjL/QI/ia91uiPA0MVd0M74rMoXvfYhM68SPeC8tXqgom1HeuwEO36lJ R+PbNzCc4RDBbdq5UJVKTxyFmxmaShNFF0bOILD55m9Dgn3DHMkvs8UJNDXGpdR4rWfj tk9A== X-Gm-Message-State: APjAAAWgiod2Fg3sEa9bQIcapQvHwBXXg4lACncpRnVED/veueU9D+j2 IhF6uw0sY/BOl10W6aQr3xn+tf9mO3A= X-Google-Smtp-Source: APXvYqz9/73X0KE74qh1HfzvMahduFe/FR2RXpfh+RxhRl+yy4IZmPn+AQ1RfEKX9lNeOUzPWzE/dQ== X-Received: by 2002:adf:ee4a:: with SMTP id w10mr4474327wro.138.1568839343886; Wed, 18 Sep 2019 13:42:23 -0700 (PDT) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id g73sm5133564wme.10.2019.09.18.13.42.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Sep 2019 13:42:23 -0700 (PDT) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2019 21:42:14 +0100 Message-Id: <20190918204214.13234-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] libavformat/rtsp: return error if rtsp_hd_out is null instead of crash 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: phunkyfish Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/rtsp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index c153cac88b..5e8adfaf3c 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1318,6 +1318,9 @@ static int rtsp_send_cmd_with_content_async(AVFormatContext *s, char buf[4096], *out_buf; char base64buf[AV_BASE64_SIZE(sizeof(buf))]; + if (rt && !rt->rtsp_hd_out) + return ENOTCONN; + /* Add in RTSP headers */ out_buf = buf; rt->seq++;