From patchwork Thu Sep 19 15:12:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 15150 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 A886F446F01 for ; Thu, 19 Sep 2019 18:12:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E1206881EF; Thu, 19 Sep 2019 18:12:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E5EC6881E5 for ; Thu, 19 Sep 2019 18:12:44 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id i1so3505274wro.4 for ; Thu, 19 Sep 2019 08:12:44 -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=kqHwd5ogn+rNpKopfKvioIQhh6ykMzXL39YGUDtDJ2E=; b=j3+K+lhXBzUKT4g8FRdh7JD+XzNK115ulf4oUdZhOmZqeLXNse8I4++gGmq5lbMEKk PHocWVroOjBFdNqN1b9qCHIFw/Fa8Hma0oZP+SdOnw1DYBUt1iwJFDKrR/1xAtllkCrW ABuXd7hORYvVNx9d2ZxTosgnWr2qvrcvZSeFWheR1KrrcimvWomgpcrvQ9vUJir/+j6w vUgCSw8hjFR1Jn22mwkGeOTrcXBkPH8iu9+8dIizgq//J0OMgx8qCcV1oAVHvLCC1sDn n6D+hmLMo/TACSSld9xneGMrptL0qmfCdgDu6LCLCZIlSv1hodTOqOaG2PauyxDZwNCi zMhg== 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=kqHwd5ogn+rNpKopfKvioIQhh6ykMzXL39YGUDtDJ2E=; b=cjFM0+AzA4Rchn2n8gnpJAjFg9Ijq1DnSI3iMcvwCAYkrAR9ap6n2pdmnjaUpOga+1 /LLmIMbTcT/+Q35nscozSIbdb3A1aXmPLEn9Rl2R/FDDUQLN6pd/ebYcRlX6JW6erfEI Bera1/qMw9Zu00bIIRjUI6oiksKYePtIptJT08M6h+soBhvlrC5K3BSs0SGIS/GgKFkk kRU+UeBS11aeGjO5KB8o/Lco/hsEDVmZIS3snAKrMkvY21jUOotQjpAjATpDDilB9HtX O9kwulGmJ5uWxg0rrgMM0zEsojBw6gVuZKqKR7uoiVcyLi0GixWwHXUm07R86Yix73l4 KWKA== X-Gm-Message-State: APjAAAV0BgSj3EYfIht4ihNVRPC7MRz7TDmxo/wy70RtVjfrFrwWsCmO sqy6R1UErHYX8wC7k5E5d1E5Lv5Eke4= X-Google-Smtp-Source: APXvYqxa1ZCGTRBAeH6rfj+k3hKGTHbvz1cTt91THMsRf115Hi0gjb5wTAU2OtyESMdL/xSzflrAWw== X-Received: by 2002:adf:9cc7:: with SMTP id h7mr7393767wre.193.1568905963537; Thu, 19 Sep 2019 08:12:43 -0700 (PDT) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id o19sm12375048wro.50.2019.09.19.08.12.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Sep 2019 08:12:42 -0700 (PDT) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Sep 2019 16:12:33 +0100 Message-Id: <20190919151233.13784-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4] 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..859defa592 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) + return ENOTCONN; + /* Add in RTSP headers */ out_buf = buf; rt->seq++;