From patchwork Sun Dec 5 14:26:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3324236iog; Sun, 5 Dec 2021 06:27:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPckaMr/o2gjNoywgMNr17MiSV98a6hqJQZv6i04eNN9FQ0iAeV81LFzxGChHPadrWe5+W X-Received: by 2002:a17:907:90c3:: with SMTP id gk3mr38170395ejb.282.1638714450610; Sun, 05 Dec 2021 06:27:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638714450; cv=none; d=google.com; s=arc-20160816; b=CJiJQ9wTBIxgJw6Bq8SwZv0+llM8omrFQ165yasR0yJZJJpKzJpsCJx1MC8pCtPHI1 3thXE0enErGilMloisD+XawgPb++ePneX4MxCOiNT2sEwQzKGNVV9Bq1x+1QRnBreJVj A+fMRz5Y/nYqJkWmZxvV77Lr7l5PXs9ERTOSyoHjaYNGcwh7Vw3KQKsQyqeWIJNou7Sd 7FkJPelXrbR1RHRHsJIqqwif+dHVlsF+ds+s52TsWgUuiw8ehutAMS9siVSlRs/m3qqt xB87t7q69O7dMD1LjfOFAFD5mIswI3Q5wWs5KOsPQsNSXd22oyRbLnC150/Z+p1t56F0 1cYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=LCHaJEEXQIWrBo+p+fh1W7m0PvrsWCa81TlgjBmtldE=; b=f0gWcZSW4kj4wYTXsmV1OQzLq0jyw/OyVWXQBbg16j8YHm30asV6PTv37XIJtuxWxs mbtpWmt2uMA94EPgQIR7a0rxtLEZHjaQo11U7n6WMjAL1QZhvOglWe4Fl11tUJVv9WRN DzwWSpLG+FbRwpMrNwxrSG9NIamH4AsxfXG9GNYbP5s/+nvwiztnmoynJEmWr8mqHNTc K44S4NEaNjk00Y2+jLajyeSsyiptpIVW7ZxPrBESjgmmqQt5kEMsqPRme8U4bLSVMtEf b26IvqeHpW3IEnMQuT9NSIqpaCilryPiD3CjxqSpxuKNei67VUHHZPyOGxlVW1CvswrL C4zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CfzrLNAa; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qb34si16640849ejc.731.2021.12.05.06.27.30; Sun, 05 Dec 2021 06:27:30 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CfzrLNAa; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8BA168AE64; Sun, 5 Dec 2021 16:26:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F110268AE3C for ; Sun, 5 Dec 2021 16:26:49 +0200 (EET) Received: by mail-pj1-f45.google.com with SMTP id gf14-20020a17090ac7ce00b001a7a2a0b5c3so8807189pjb.5 for ; Sun, 05 Dec 2021 06:26:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r+EIIsjSBXniCvw4Q8t89Ng/OYqg4N3e1fadhD/2RIY=; b=CfzrLNAa6FLJpxi22IgUtN5er5myHLCNHzH2eVxnUTpx/xpIwzfdfONjQKjCHaILKh uSxoWM0YbUVTddHo/dy0XLQRwPh3g2zpx8rfsO186PaUreC0cty9kRw8ll8a/Md60pjA iXOJLkflICCACn1UtGoe+PlnLkPhYtu3t0zagqXU3UTSL8L9O7Bfc4yTS8Hz5niloaIT 2VNZiPZqiIanpOBz/k6JLvTeqvDY3hmaopP4walevf7F3eiIY0w63CU0QyGo1smtcHAG 65rD8BdYQkhVdumzfbE/T/ffqU6P3R1EXNz4UpXtFyRJfW+XvlwPPER1rjYXDRtzoRn5 +qgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r+EIIsjSBXniCvw4Q8t89Ng/OYqg4N3e1fadhD/2RIY=; b=6DWR03mLkuqc50fJYT/3ezJzSNR7YfL97zmHL6s12koTOYtayvOk+jdsS96opxPE97 O9K6MhF4sGOE+LHxDHfwPCItvNVS/YqMU4+ub/oz4fdIn/MBl3GeI1SrXoRrYuCxAkLj cAZ2sq242PY7W+YswGZASapK+NlKuXiGTdXNqdivhcdLzKL+rNokGt+LNW1fyqkUyw+J NEdIZ8zs0MN4Ujz3xnEt9am7dMzSvp1k3D4QHScEbue4/wJcxjSJpujCj5Oa6Nt06DC3 QMgynAkwS4dXH4Xfc1HMAkCvkPkAGL2jGhLM1w6uWgkyA7zDAY8m3P4xJhIa6WFZpO5Q /Urw== X-Gm-Message-State: AOAM530rQmcLL1JNB/GNScc86DtrvJS5bap7FLDVtKi9Wnr8a4gkyttB LuJ7foIZzvdQjlktXggMF8CaqRw8Q6k= X-Received: by 2002:a17:903:2352:b0:142:76bc:de3b with SMTP id c18-20020a170903235200b0014276bcde3bmr36942694plh.36.1638714408215; Sun, 05 Dec 2021 06:26:48 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x9sm10192265pjq.50.2021.12.05.06.26.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 06:26:48 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 22:26:34 +0800 Message-Id: <1638714396-23062-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638714396-23062-1-git-send-email-lance.lmwang@gmail.com> References: <1638714396-23062-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/6] avformat/rtsp: check content_ptr before memory allocate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: LJrJ63akYm/1 From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 2ee2463..233ed16 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1240,7 +1240,7 @@ start: av_strlcpy(rt->session_id, reply->session_id, sizeof(rt->session_id)); content_length = reply->content_length; - if (content_length > 0) { + if (content_ptr && content_length > 0) { /* leave some room for a trailing '\0' (useful for simple parsing) */ content = av_malloc(content_length + 1); if (!content) @@ -1250,11 +1250,8 @@ start: return AVERROR_EOF; } content[content_length] = '\0'; - } - if (content_ptr) *content_ptr = content; - else - av_freep(&content); + } if (request) { char buf[MAX_URL_SIZE];