From patchwork Wed Sep 18 06:54:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 15135 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 0554044995C for ; Wed, 18 Sep 2019 09:54:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D97D868978D; Wed, 18 Sep 2019 09:54:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CF32689204 for ; Wed, 18 Sep 2019 09:54:39 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id y21so1112430wmi.0 for ; Tue, 17 Sep 2019 23:54:39 -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=NPFk3MtGjyjk6xKHS8bBwTCJuIVLAUn+0/rcJiDQ4KA=; b=AnGQ/GUijm/S5d13NSFSB0PAeggPCQgnON4vkGeyQ0AqY7ixVEj/yCjsKO7W5POYmA BvH8/EZt3YS5FJR0hp/SC+c2kXAfcLhq+iFflYHg71dGt1eDaJw74qJFZ2GiAQu8IOE9 czYWfppc5i4olEuwD8UUrRab1ENQXvrchS/IazBfm6cRGeY3pu3YUvmxvC77rz9tTp8l IaMgUzFbDmHoI3YStKcF28pPQCp9mKLZhloW3RVbLe8r72drzZYQXUD0EdZ+n81QGeQo L1gYf2poQ854fpqwN+pImC3i71wK2A7YJsjC9mdbzp4ei9AXeKOu23gjxBK/cISbfzFZ mtvg== 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=NPFk3MtGjyjk6xKHS8bBwTCJuIVLAUn+0/rcJiDQ4KA=; b=keZLSMnOw0/RINQIEEG+BJDKDYTUy63dkMbzRz35ongLybVDCUVnzy/GtkeG8cT1fq D/Ldcx801Da6bJQmLLRKdcmKcGYgkL46XIM6g/6BDVUEnyFJB4BFg3X70QEPmd2QU7Se 2zbz9BkMgsWT/o0z/j/NeCqbL8S//00M4FO6Q9DxSs/5/G14IRjSvrVK5M7qgpZi/d4x NCzxsdHIyqPCmekV7x91ZFYKWWQqF1b+yy877+J9POTY358Ejvo+r7gBA56g1lG6rX+0 5wkue4CqWCPjAxOnlBvHQd+D3ua4wIwxhCzcjKM3HAOcOJtZQM8ZqSGQj3f+nE71uEt0 1idg== X-Gm-Message-State: APjAAAWleU74fMiyDrJZVCvQK3xrf9vyvaXyjQcQr6t4wfdtL2xauxuE fZPMDOR9aSUnynwM2+onsF2htKJ7xwc= X-Google-Smtp-Source: APXvYqxpeNSnFyMhPM5rCoRWkXADLolFXPfxDApZ+9F7UKQXBpk+IYX9pzonScpqoaCwSXm+DMtOHw== X-Received: by 2002:a1c:96cd:: with SMTP id y196mr1354302wmd.67.1568789678423; Tue, 17 Sep 2019 23:54:38 -0700 (PDT) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id f18sm4794194wrv.38.2019.09.17.23.54.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Sep 2019 23:54:37 -0700 (PDT) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2019 07:54:27 +0100 Message-Id: <20190918065427.11817-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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..3e8606dade 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->rtsp_hd_out == NULL) + return ENOTCONN; + /* Add in RTSP headers */ out_buf = buf; rt->seq++;