From patchwork Mon Dec 6 04:45:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4095887iog; Sun, 5 Dec 2021 20:46:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyealcwSoWh01KDhphStKO//03h6oZIRmJPx7qYlhhtyVmEuwzo15e0ud27S47dMbat1F6J X-Received: by 2002:a17:907:1c0a:: with SMTP id nc10mr43655432ejc.211.1638765965794; Sun, 05 Dec 2021 20:46:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638765965; cv=none; d=google.com; s=arc-20160816; b=p7+Z+YnQ74fSvFGS8VWUq3KXwObfqHq87QN1GApFN/SrMKAt1enanGoLStlrMaqJMC xF0mXPDiPgf0lR5WmDUaqKLNEYIgtoN6geg/3xs7SR/lStq2+6c0Bv00NKEFZbn3uDP9 Y9/yRsWEK4yM3t9AXuO2BZJSu5dwvr48i+xwjvbdCimPA55X4tMw4WZ0/rLvi97sBIee FRb3F2lIQj/5spY7YsLwmEBuCNe+POGA/UP5tjyfSh45grXASigup+I7jHhjmYpIfZx/ 4w84u6g3Dfw6caQNqPHWSmc8lfWFHs9lqgHTGHV9qUCJBqDQAa2sX14iF1CSXOXU64DP U9zw== 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=iQhkoG+weGLq/ccuyosje4jUbVIsOYVG3fHJfRrW6UE=; b=tsLXkO50KaRGyj4WCFcZkDTki7b4TBKO6xWB9dq2Msy3pgp9cKM8SLo7CMKelWPq28 +BSg/BM2oHBNpgSl/veNlvYuJRwwHjtuliHrppN5bifHciUmw+zMvmmF58IdUZEg0I4n AltLtGHT0HDmtKIxLWOvs2THf9uT1FAgiRdNGj1nij3IHHXXJoroPPQ/k9KMDXWeX8B+ /atk6l0rbklmh9IyIjRBaKD+fNYXFvtjVS8Yh2ys21Avtl60wwL44cgnKEDFVS+hWmMB 0y5NgTGPH7kTYUiDl5Xhbf1641uTllzEOjZnLXl1Mzw60xYSXuS65QXWX/7mZzOgs1uR ObEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=NgnCQUUL; 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 js5si22909564ejc.656.2021.12.05.20.46.05; Sun, 05 Dec 2021 20:46:05 -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=NgnCQUUL; 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 4E38D68A92E; Mon, 6 Dec 2021 06:45:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A68AC68A83D for ; Mon, 6 Dec 2021 06:45:28 +0200 (EET) Received: by mail-pj1-f53.google.com with SMTP id p18-20020a17090ad31200b001a78bb52876so9819538pju.3 for ; Sun, 05 Dec 2021 20:45:28 -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=qTBQ78foLEx6mJEr+tHb6k4+WL5xETqHWuNJ3aviabU=; b=NgnCQUUL3uYNHe07sJz+8N23nCcInhEtwwOYS8ZfKdtWAZcXEEDJTlHxNLkMd9MLCJ TjOVkTR0dQTgOjN+BF12BXgbsJhYtXXeApUP8SZd3+WNJgUdlx9PsOZlhOdi8HKMY3DI 5jWiss8xHNtfC1fvWI1IZFnwbAM03GAK9mxw4hqJqVANe1v3gGJsyEBSbgtNGVystJhV iYDtFvt/0qqx5T73zqu7BWTXxVgb4oQSJOtCxRBeB77Z/fGFwt8Dhx/ISK9UmIJDNdeZ jTqZUx8VyXrRBTp9ludyzWnLljDH/6Aotw6MpX60R3Vr1LshH/lBQwNgd73w6fyEZhiE p9Og== 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=qTBQ78foLEx6mJEr+tHb6k4+WL5xETqHWuNJ3aviabU=; b=XS+HdVPYO9Pmlp3d4HlpNXp5qG52fkSl7faiYkGzho7VL5J9k7vDuasimmOkIUapd8 NrlYF5LhCndrMZ00GVv5z6/5hJgPuWyhpvo9DAxMNYB2GKsoYlHKQ6oYZDzhIMssFdIx /ej/glUrqPsTitpxrbR3xtJpP/UrNl2IJSues3fExiZS77bFACDJigpWhPJxKmzHK6c5 98ptItGssLdTQbT1y6B7YCEiZv+HnhATh4q4LSRDkMtiWY3raV3faYfPL/7R1LXm6ZTp uiEx0kjsViarHlFK7vxwBlnrp/b2Yd1ahDppXKVfGBM2ZxmMy499eOEignIbKVmQ1Ibe HYRg== X-Gm-Message-State: AOAM532CplEDDA92opyDgJPbK8+YfgXaXOt0nu+0fb+HobSiPBJdD1WC 9NiI9avqa9BklTQ6QbMPOMkkBJbcjzA= X-Received: by 2002:a17:902:7595:b0:144:ce0e:d42 with SMTP id j21-20020a170902759500b00144ce0e0d42mr41618870pll.39.1638765926967; Sun, 05 Dec 2021 20:45:26 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mn15sm8278289pjb.35.2021.12.05.20.45.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 20:45:26 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 12:45:02 +0800 Message-Id: <1638765904-2521-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638765904-2521-1-git-send-email-lance.lmwang@gmail.com> References: <1638714396-23062-1-git-send-email-lance.lmwang@gmail.com> <1638765904-2521-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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: eKmfxRdsRNs+ 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 3e4a68a..b3d1e91 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(EIO); } content[content_length] = '\0'; - } - if (content_ptr) *content_ptr = content; - else - av_freep(&content); + } if (request) { char buf[MAX_URL_SIZE];