From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 4BCFC4DBD7 for ; Sat, 1 Mar 2025 21:02:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B7DE68DE80; Sat, 1 Mar 2025 23:02:13 +0200 (EET) Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B28BD68DDCD for ; Sat, 1 Mar 2025 23:02:06 +0200 (EET) Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-e60c4412127so786984276.2 for ; Sat, 01 Mar 2025 13:02:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740862924; x=1741467724; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wXaSJMMCOFK3CD3VJXlDDWkKlPns745n2hXkDi1sVLA=; b=eYtzEZCQ+0s4fysmCW7cJSDEoSTg0sqAPA75gxM/vztAfBl3TmsdX13bUpaYdDHxrX qs2cDN+emzoM73QFp7jQM4aZAmFtNpCho7zz7jWrIM3uwP8wrv44C3mOqSpDTHoYFfif +6JkvjUhIY5PYftz9fT+EnLNcoGczD7XLbkf9HGCu2WbT2Ptxv4PBoBphk1wDBfy2YA8 0Yc8m90GXGir0uGCB5yhhNUSgA+/0VavJnnIp6L4M5K5wO2N7pZ2Xf+bqxsBjGRFlya9 QkAX5q3s8E1A5h28VbJNycNj/JfhcQdTSJOnMgC3l53HXCDZnwrV20ZwjVcKiguUuLv7 cL4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740862924; x=1741467724; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wXaSJMMCOFK3CD3VJXlDDWkKlPns745n2hXkDi1sVLA=; b=qLercwjkHPAd0IcCZHyZ3iCdfQeQ1DHqMAsiaayV8MXMtb/z79s3jyYcWRmUbBxmLj 6DKX5P6WVQyQl14CGL9RCfjA+Ag/zA/Kq8Iu3ok52+HSIhtHs+tyhbf1CifprQZDHuOo UxYTRrJhnHdSbrp54I3Suezoz7ZN1vvjrmdHawvd5JPzLT5KfPPPqjlUtBG7M6YwydRU hvx8UpYrLWPFdkK/BbQB1EclAueFnePG8WK3OEHM2utCTsZ10OwpPzR+1EON0LlH2G1Y mqvkyfYiSFC4yFFKB4HBTBoWhWpfGq0cFtLqU5YwoRXItfOMnH3ds8GsVaEhmWqz5oYE FctA== X-Gm-Message-State: AOJu0YyfLtQZenS651A+3W+dq4k610v3IE+TeiiezBX7W8Efexip4CpC Ug8uPj8GNzDaiVqtWgmaI2533yKoa2lKsPz6AYj5r0GCIjL8OUiy7luxcQ== X-Gm-Gg: ASbGncs3P7RrlPzj2u9mC+vEb88gbTdLIFRt8amlo5ZnTZJ0Id7nKkge3YDe0r9qB6D C3YqHTD9dT6sTJjuxKg07c3U6iLZhKUbgipit8KnNkzVkDz9HcVPZzzuxC+JhCbYzvPgRmVMR6a 7UqfQiMse8fZbftMGbS8iaI4o2M3ghVnlMYQ0NOQUje0gzdQKIRTzznFaS1NkcQ+q/i256/7p/g Ozh3vY6seMAhwhxJD7zgwP16iIwQXvMl0d55o2CQPTErUv4JfscSUqY6DV1eVB8C0TcvwiF+YTN FGA2juRgv7lMP01B9BAARyMycXFGx8K8z3FvRkAo+0dGJ5rQLnPKUuxzx6pq6x5n6te6Nf5wVmN Sgl9ErRKiOlLXWZQiYHOCzr1NUW3Ygk1p5qH6BDY= X-Google-Smtp-Source: AGHT+IEWb5T+if9IO0UrHNtKzl2Rf5h1moQWXBHBFqf0R8uMl7HE+zwt4fJop1QZgZ8QDxuMwhqyqQ== X-Received: by 2002:a05:6902:11ca:b0:e3c:9fb5:837a with SMTP id 3f1490d57ef6-e60b2f1cf93mr9676669276.41.1740862924296; Sat, 01 Mar 2025 13:02:04 -0800 (PST) Received: from localhost.localdomain (108-65-109-112.lightspeed.tukrga.sbcglobal.net. [108.65.109.112]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e60a3ab022bsm1914236276.48.2025.03.01.13.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Mar 2025 13:02:03 -0800 (PST) From: Rashad Tatum To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Mar 2025 16:00:42 -0500 Message-ID: <20250301210042.2002528-1-tatum.rashad@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/rtsp: Change ff_sdp_parse and sdp_parse_line to handle memory alloc errors 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: Rashad Tatum Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: for RTSPStream and RTSPSource --- libavformat/rtsp.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 25a7602832..c5c47801cc 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -423,7 +423,7 @@ static void parse_fmtp(AVFormatContext *s, RTSPState *rt, } } -static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, +static int sdp_parse_line(AVFormatContext *s, SDPParseState *s1, int letter, const char *buf) { RTSPState *rt = s->priv_data; @@ -504,7 +504,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, } rtsp_st = av_mallocz(sizeof(RTSPStream)); if (!rtsp_st) - return; + return AVERROR(ENOMEM); rtsp_st->stream_index = -1; dynarray_add(&rt->rtsp_streams, &rt->nb_rtsp_streams, rtsp_st); @@ -677,7 +677,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, rtsp_src = av_mallocz(sizeof(*rtsp_src)); if (!rtsp_src) { av_freep(&dest_addr); - return; + return AVERROR(ENOMEM); } av_strlcpy(rtsp_src->dest_addr, dest_addr, sizeof(rtsp_src->dest_addr)); get_word(rtsp_src->src_addr, sizeof(rtsp_src->src_addr), &p); @@ -721,7 +721,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, int ff_sdp_parse(AVFormatContext *s, const char *content) { const char *p; - int letter, i; + int letter, i, err; char buf[SDP_MAX_SIZE], sdp_ip_str[50], *q; bool parsed_first_media_desc = false; SDPParseState sdp_parse_state = { { 0 } }, *s1 = &sdp_parse_state; @@ -762,7 +762,10 @@ int ff_sdp_parse(AVFormatContext *s, const char *content) } *q = '\0'; - sdp_parse_line(s, s1, letter, buf); + err = sdp_parse_line(s, s1, letter, buf); + if (err < 0 ) + return err; + if(letter == 'm') parsed_first_media_desc = true; -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".