From patchwork Thu Dec 2 10:37:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31879 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp216149iob; Thu, 2 Dec 2021 02:38:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5Isn9yz4OJu02a1IquZo0ZID3OD9y61VlUpzAfkTVn6JEbbhmfjVWEZuW0UNdzucCkiO7 X-Received: by 2002:a17:907:7250:: with SMTP id ds16mr14641479ejc.54.1638441486979; Thu, 02 Dec 2021 02:38:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638441486; cv=none; d=google.com; s=arc-20160816; b=Yg09iBD77cvm+Ui7rxR2TXn7Ab1pOe0R2Yx/Hw1xCMzJJdh7mdZes0Il1e2YhbYMGJ qN0wrvzcqCxJ1YLrBz0LsqhMiCeViFx17ChQSK7luKACoMVIIozxvje2PNTkShVKSxQG HP45C/7es0pK30jkOJEyfgT9vUG9R8bcYYlWie9KHsOTwZ+61nxu/NgQhuVwcz8U2FWp kmuaTv0FM78I1YtQyZJxA0dtFaOwksZ72tftLc8oXC4DvGXUFFYTsQdVlKVKcaz8zcHR NqPEmWJ16ZVhDCFpnk4nLp3USLJm6br06b96TfhrCU7boS4DVR09l0+LSL2FpG51dvo8 l/Mw== 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=j5RAozfZAnz3SQQsnvKShNO92+lKTuvq/I4/UiO1e6w=; b=J0hiv6XLvEmMm6DvNmkD0KMUv77HQ9CkYv+qwrSy2TZLrmTgwcPWUxTWWG1C2hQj0o B9drJoN5os99Pc3GRzeBszE4pJfKUoCGTOYALWa3WACP+b/jEH6yIfZ17pKmunbtxTKO P09i8O0sXfTTIulgXKu2yo7ywihSsQzNaGUvV8tEUuJXj2FTr3ruSrTVJJ9qrRid+MXT 4NKXH+QhQiYjrNKsUGYp6+AqhHEHYwZRlX+IXwT90Y7USsZe9V4xAEbBOQNxnf7Q+dx2 eyAZDWeyICVd71443Gm1H/fX0ggmbw7EnRKJH4L5kABSlcEXYCsdgAO+ewBj+qhRgf98 LRmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=q20yDKsM; 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 a22si3920430edx.382.2021.12.02.02.38.06; Thu, 02 Dec 2021 02:38:06 -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=q20yDKsM; 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 B869668AF40; Thu, 2 Dec 2021 12:37:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6657068AC6A for ; Thu, 2 Dec 2021 12:37:46 +0200 (EET) Received: by mail-pl1-f181.google.com with SMTP id q17so19902073plr.11 for ; Thu, 02 Dec 2021 02:37:46 -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=8nFF1lP4mx8g4uSTw+W+FPMNzte+mEDscticb+xUBqA=; b=q20yDKsMRt6VqHEras8KeGK4n2pbORRRll+7ybWcpsbmi9APMfVsoSQot2Tl7ZNrxt ieMTwk+A/3CjX9zKNH02ujtc/3dUTuQJHlt6Qj6z0yyCOY8/nL6NYFR0yYD448CkVrAL sJMvnC73BGVLFDooZSCeJ4MMeKiHaRE21jKNFgOe+YFRx9smr88rD9DoEJ8178qyV8NT PXgGNYBfGTfaebYFU3toPjl53kn32UkygWuNoX0lGIrSHMiGROshRROeEI+KbFnYVXcS KkWOU09KN/mn4UnQAy7kMCOhklJE6cvggz/lPWXFZQDoTazdoMM/ZwAo00sRBX10ObGY vp3w== 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=8nFF1lP4mx8g4uSTw+W+FPMNzte+mEDscticb+xUBqA=; b=4terg7a3khi62SJraiKT8MPrLBGJ5cZZPdjSoSRByV+8nPVSew/8YsQ+lpnBntIXCp X9BO5sp6x/hWpJGF8kSbqKLmmu3XZD1kZcNVRhoSUnj/rHIQe+wznz0cnZR5HWPuGWls BUnxmEsZzV2y9UY+KEENMQfOn4bHr+Wt36OF9ZObylWiXdHFwdMvFX4bCdckUUrBBWm6 AqtZqd1beyVO0Zd1Oi8b4/cfNSSTqJtRUWiYbWTd9MJnVQCXinwZorKHnKMt/FYcnv3L 7V2PoWINDlnecY60G3oL/HPZP1LbYU4Ec6/jKhv1QbC/fZZANgA5xUaV1+HrWEut7f83 0aEw== X-Gm-Message-State: AOAM530l2c59J1tufHRjSDRnVFrdAYtNrdMcWyve6cK3oPU3vpCJ9tOI EASVdllAhSkdIXKrt4DmSZBkMkWKcvk= X-Received: by 2002:a17:902:cec4:b0:141:cfa1:f7e with SMTP id d4-20020a170902cec400b00141cfa10f7emr13943027plg.13.1638441464686; Thu, 02 Dec 2021 02:37:44 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id f1sm3275191pfj.184.2021.12.02.02.37.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Dec 2021 02:37:44 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 18:37:39 +0800 Message-Id: <1638441459-21819-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638441459-21819-1-git-send-email-lance.lmwang@gmail.com> References: <1638365954-29420-1-git-send-email-lance.lmwang@gmail.com> <1638441459-21819-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/2] avformat/rtspdec: get rid of the hardcoded max size for sdp 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: s7jw3pHdF+JT From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtspdec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 0e91e3e..2ada29a 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -172,7 +172,7 @@ static int rtsp_read_announce(AVFormatContext *s) { RTSPState *rt = s->priv_data; RTSPMessageHeader request = { 0 }; - char sdp[SDP_MAX_SIZE]; + char *sdp; int ret; ret = rtsp_read_request(s, &request, "ANNOUNCE"); @@ -185,18 +185,24 @@ static int rtsp_read_announce(AVFormatContext *s) rtsp_send_reply(s, RTSP_STATUS_SERVICE, NULL, request.seq); return AVERROR_OPTION_NOT_FOUND; } - if (request.content_length && request.content_length < sizeof(sdp) - 1) { + if (request.content_length) { + sdp = av_malloc(request.content_length + 1); + if (!sdp) + return AVERROR(ENOMEM); + /* Read SDP */ if (ffurl_read_complete(rt->rtsp_hd, sdp, request.content_length) < request.content_length) { av_log(s, AV_LOG_ERROR, "Unable to get complete SDP Description in ANNOUNCE\n"); rtsp_send_reply(s, RTSP_STATUS_INTERNAL, NULL, request.seq); + av_free(sdp); return AVERROR(EIO); } sdp[request.content_length] = '\0'; av_log(s, AV_LOG_VERBOSE, "SDP: %s\n", sdp); ret = ff_sdp_parse(s, sdp); + av_free(sdp); if (ret) return ret; rtsp_send_reply(s, RTSP_STATUS_OK, NULL, request.seq);