From patchwork Mon Dec 6 04:44:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32055 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4095501iog; Sun, 5 Dec 2021 20:45:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5pLekhnP0gf5Iaw0U19HcBDf28WmGlIgkm6XNiKzV03hwvrXaMEeCAPEhcdvUioC106C2 X-Received: by 2002:a17:907:c0e:: with SMTP id ga14mr42535343ejc.26.1638765938051; Sun, 05 Dec 2021 20:45:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638765938; cv=none; d=google.com; s=arc-20160816; b=kr0wx5SHZpEM7S/tS3eI//Az+2PWrd2ojWzQLMzDJefKK8uXejmqSromsqUMGvDv6l jFBmjy8G5Ed5H6lCAWTKrPRle/2yda+YMumRtsv1i/PI6JwRDrcWTamApzF3A5o39+Vg MvhBsX81gcxwhiXKCkgKKmbrg5wj+cTGpiUL9QFCv/ZciT6jr3xN1QTaaqyCBcRwYVKA 9nnPgr5QGyeLOkDXh/CKMpn94jasqxas1UbWrwBuJYx6kRUsn7/70bflMAp923o3nHH7 WdLjhXJpml/a0gnIYb/kjnL11+RkDP8VGartXoF4avtlHDMwHpz49R5yNQFlQv0EylN8 jg3Q== 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=MDGW8l5H2kxGXzWJDhXP0ceam1v051TzM2h7+2B+4tM=; b=jxhdEWpDaYfm/qEsWYEkuHZQ+tHWbgMzoJkRlpZpm5RhWki/OjlfrdKq7rPqlwtvwJ NMljQxqYLJrUxDRmgCx0GJPCWs2teKn+OvR6Li4z8FcEuIX1F5u+4VjT3H9HxT5YKbb9 CG0cQHGz7sOufmYfbGvgVt33oXFlxcg/ee7NJLksbjZSeczcEZ0kJAippMFengaSum4T YHND0MVnZyvC4tjvG0DXY3JEi0XIco0kx0u8idNVcIDIdEkch54AUu0LwbWpVZRElGfY 0l2621k03+s8JELf+mgcd+396BFcnWdQ1lQ1Wy7JIU8w+CQt+AankJU03n/wXy/xmhve EqHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=n+sXOtJj; 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 qa31si19544346ejc.299.2021.12.05.20.45.37; Sun, 05 Dec 2021 20:45:38 -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=n+sXOtJj; 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 158DE68A4C5; Mon, 6 Dec 2021 06:45:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0D0868A44A for ; Mon, 6 Dec 2021 06:45:25 +0200 (EET) Received: by mail-pf1-f169.google.com with SMTP id g19so9043861pfb.8 for ; Sun, 05 Dec 2021 20:45:25 -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=FhwSZ1DlVue9nDCO06qf0vn7f+jVcsylwPe1L/ZwSew=; b=n+sXOtJjrjnZpo421V72XarUonNc5+iXjrQa7nY3tCUGy5oaxiajytaPZkRUXCNCZK 162B944w2jy1UFWifB6R13dXsE8iocw2yqwx8umvU1+nFDeAo45IXQuS6tjl5vGDgtnj 5Bhp2NiIjoaKEx5SnaqGkVw+0i2wEtQfj7JFMVZlNNHyzwS2xo4E0aiiMs2nQcX75Pj8 3GsyUuLMplGlpn5etLgeSMBT5sq6lQ4hIwJpfAMyK09Y1Nb5tQBN7K1Pd046m6y88odL fdtEKqLR5XppSsAVq8DsxmCLxMfU8i9AEmoQdAdWjY2dufjHGalv6E3KW/IZrHcvZjWP ttzQ== 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=FhwSZ1DlVue9nDCO06qf0vn7f+jVcsylwPe1L/ZwSew=; b=PskvvGRopkhceHYDRW0rKaZzWdRPkGtp8R3eePh4kyc31UnVMhpuaSku7CbSZPC94b Fc/uUV6/LwHqYkrATmq+rF8T5e7AzmuSCy4uDSXF7uSA/VNd/mnHDW8bMYEK/NNHZcoc ZsbezVxacp1C87VDu7IpS3wfW2cHGGuU6A0ReGd/IkP1QjJH7fsvR6nsk9qcpFfyOnVF wfsJiAWo21qHvCb9p9cZ2lWy6PR3xnu5KyD2hm2FqF9dM10kT2yfQ9jYQhEZzG6m6sVp KGYOjGM+NSPLzg+dhb25CpGdGaZFN3OwGlkoERI4kXfbOrb7/YHCYVTQ1YhqsduyaUIP o+XA== X-Gm-Message-State: AOAM530CrKs/y+9qEJT9hCBadPptcVDRHzMO9S4QD6LHexRqP7+BdBTF YhnH4PAxTu0K9iJCUf7kPRaNw26odvo= X-Received: by 2002:a63:8f5e:: with SMTP id r30mr17163081pgn.106.1638765923331; Sun, 05 Dec 2021 20:45:23 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mn15sm8278289pjb.35.2021.12.05.20.45.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 20:45:23 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 12:44:59 +0800 Message-Id: <1638765904-2521-1-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 v2 1/6] avformat/rtsp: remove redundant assignment 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: OgqI2P+/mSk7 From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index deaed34..47120fd 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1178,8 +1178,8 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, char buf[MAX_URL_SIZE], buf1[MAX_URL_SIZE], *q; unsigned char ch; const char *p; - int ret, content_length, line_count = 0, request = 0; - unsigned char *content = NULL; + int ret, content_length, line_count, request; + unsigned char *content; start: line_count = 0; From patchwork Mon Dec 6 04:45:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4095678iog; Sun, 5 Dec 2021 20:45:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyWHAnfmGCGnGYqzyTax1UoceAo3ElSQM17dBJHilOLp5wgFEkAtyRqz7uZZemhu3Nfs5FE X-Received: by 2002:a05:6402:5194:: with SMTP id q20mr51101452edd.123.1638765947708; Sun, 05 Dec 2021 20:45:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638765947; cv=none; d=google.com; s=arc-20160816; b=VlHpWJXGUJm41IfRnzWo2pgfXPOybbs2PLULq6QWJk9hAgeG7A3u7Pudh6QR9RqFZe OnDF74PWkF+3BToryl2xKTlyg1QhGxOHbhiJTLWyBzzEFF6CNFYVto7aiJgdDg5IABE1 JwgZOXpLtqSdFLmE5dsTw03tmDrDHlY9kI+8cJ10L0cQVErx+VgGdI3uTDvIfJLHxNg6 GoVnVpbaaURNSSJNFPOZXNtzzquRgQT9EqwFqStz4YaFrxmyjyWTDQfnVkfyn1kGSq2Y ld4nJX7rlx+D9DvgrnTxZ9j5CvnLdHNcZReMpedEme6YNdSw5j6y0n8tDaig06LkLh/u wCDw== 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=JILEGXTOTrmQqb6bE4LX0e000Zo0BhdnftFzklMeO/s=; b=WeilTwev6veOgYD8l+yGxjzN58nfUB6QljlIclOc9eSNP4trBSBSvcQEVmieChtIDq YJpTp2ysd+f/tYeu2t6h+WRXn9Mkkws/bubSF7nNF6iSbqVteF/zJRYOdENkLY2o/pgP x7dpj0xGCx6nkWLgCe3ZIAQrV3yihGthjcBIgTB0cBx0vYbonc2y8OOUCosxEVmo5pXL IOo5DooIzNxAsMYpu534iWByhPeBt095F3dUxqRQB1g2KjpmZQQNAEkXAWOG8UzNuKn3 qebweTf31+2qt5ZL1CxbaqPcSDTvyU7CsntNdGo3jlA39MVvgwlKfjmBbWlESdGPSuMa 9qVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=V6vuuXCu; 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 yc6si14660284ejb.14.2021.12.05.20.45.47; Sun, 05 Dec 2021 20:45:47 -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=V6vuuXCu; 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 29A0868A773; Mon, 6 Dec 2021 06:45:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E6D768A44A for ; Mon, 6 Dec 2021 06:45:26 +0200 (EET) Received: by mail-pg1-f175.google.com with SMTP id m15so9275296pgu.11 for ; Sun, 05 Dec 2021 20:45:26 -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=sf//6gC7S0a6iaqN5gWEfYqcs6ianicdqmaxS6eudU4=; b=V6vuuXCuz/GxZkM5+hes6ObShhIPOFbZg239KsngzX9Q1sdcFX9KV/tPwLETfbPU7X tMcvxYo0VcHQdyOFD2fnuW8FKsH62D6u6cTPcJHwrFiAhf5mt69QuhyfPf76xV+argbi chA2II8pvWEdCyzIR5eTXuDmRhEo08P4zghcei4KvjdxA8QlpODQ2Rtt7tTytZEWxqRY f5HGtvI8XG963TpZi5bxLtEQCsrWwQV1V/Fi4o9XRWGsum5kAhEs36ATX/9xNGIeJ4Dk Ujgch+XUXj1sGTM9RwyjdEaE+QzzuiXAZ1U6Ff3GY8hPuUWku5n6rkigMyFQMWO0AUVf pAvQ== 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=sf//6gC7S0a6iaqN5gWEfYqcs6ianicdqmaxS6eudU4=; b=klP4KPgaaC6exIOuPpIrtkK8Ud7fhOdp3QxDwA5ZjG4e09leYwn9hRHVwoOQMkiw5B An25RQtpMvfO1qe83E4H3VkXmCqx+RLz5Bo8UPT1CRFqOTwuawKyF+3rYSB+JmCQ1N1O n/sgGYDkGm3MsZTq9CCsPcEdo63szscsoiuHa77V/Py7cueP+VHHcG53zl7dwN25DJ4k Gx7YnlBsv7tE75+q2pJwJtY3JFcYp4XdhS6kfVIsGUefB+2JGP/A+jdlo0Q3rvNr9Ca4 hKfR84rOo+WuPokko4xFi3FP/+d/X7H84Bam3lHQz3pEMM1T98pK3t2W0/+uHGJXu4vI 2gNg== X-Gm-Message-State: AOAM530zOa1KTj5stSwatdALiTeVO4E6hlRtdyG5r74g92cFuluRT+xn Kkt3o6hY/BL4iVeRfbOLA+zPTd6Ox5s= X-Received: by 2002:a63:c003:: with SMTP id h3mr17161662pgg.261.1638765924566; Sun, 05 Dec 2021 20:45:24 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mn15sm8278289pjb.35.2021.12.05.20.45.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 20:45:24 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 12:45:00 +0800 Message-Id: <1638765904-2521-2-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 2/6] avformat/rtsp: free the alloc memory if failed 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: 0bWPCQN/luyh From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 47120fd..5cffe0b 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1245,8 +1245,10 @@ start: content = av_malloc(content_length + 1); if (!content) return AVERROR(ENOMEM); - if (ffurl_read_complete(rt->rtsp_hd, content, content_length) != content_length) + if (ffurl_read_complete(rt->rtsp_hd, content, content_length) != content_length) { + av_freep(&content); return AVERROR(EIO); + } content[content_length] = '\0'; } if (content_ptr) From patchwork Mon Dec 6 04:45:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4095785iog; Sun, 5 Dec 2021 20:45:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWDmZjET371jKSDL0rCy/k1LwRuNWvrLm1wGNjkIj7NbwRzOqR1GBZxnI8UVMKvVWcDt6f X-Received: by 2002:a17:907:1c8a:: with SMTP id nb10mr43962477ejc.5.1638765956476; Sun, 05 Dec 2021 20:45:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638765956; cv=none; d=google.com; s=arc-20160816; b=ATpd/Z/lgGf5CvE60nfjzzAveyRPbnnVmmJrRqLzR7qIZ6s+w/Zyxv1cJZJaUP3zj0 oO5zXd2z83D27JRArneBrjlEK7UrQ790YKwxUYRAGVYCCqtGnAMeuhAHp2+x/ScpsFAg 3D63Vj9D/DxCKANnPwdD0244V6l2MSHUxqmLoB2bSEXGc5YX7NdrLYXu2YRlkadez6JI xYDcB+cz4ZXJOY9qjjvKkX+8nqoTuB6U+W3Qde9Dvzf0pjhKrqrH4L3Tq3IBC2apE85E pzuKi5h3xNq1UPegJfy3dnN5+EKofPqgQrwfbynOmGoh5Gij0UvXF9aZPwzjsQjD7Rhu kZkQ== 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=KhRBX25JIxuhfD4nxYxHduKNdkPdRz7RqFmp3ORms6I=; b=gKtE6hdn0cTmmCEfFtvBnyhuQOsbk9H03MuO3jK4dxB2t1VfEZkDmBGoeMuxMY4xF4 jywoMHd4vlU9nYkJr83VDYTmsCCbs0t4+coemE/xx15NCRVQW0HdwICCS1J0iCPh+D6q N5RNBwMdzFtRA/bkFKLionqsTOgCmPco81WyGzC5Z+e9to5cIjMkR0xF1xXg5O/2U7AM mxpO4N0xvjliVdrzN6ONl8hj8CcD8ICe5pbpjnAnrjXLm9rBfO7VZbM4sdhJGeMOd7In 9zkiE4UaJtaShYHfF4wwCd2cPmjsqYBOa/9SiOg4apxJEMOt1Cidm5myCeRhKOYlRJlj eZBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="gsJ/PgEJ"; 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 gs44si18994799ejc.572.2021.12.05.20.45.56; Sun, 05 Dec 2021 20:45:56 -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="gsJ/PgEJ"; 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 343EE68A4FA; Mon, 6 Dec 2021 06:45:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7908868A4FA for ; Mon, 6 Dec 2021 06:45:27 +0200 (EET) Received: by mail-pf1-f173.google.com with SMTP id o4so8999276pfp.13 for ; Sun, 05 Dec 2021 20:45:27 -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=us2v0oVZKl0QIwN3HA5w9+hxy9CSy5yV7oz6K0dyghU=; b=gsJ/PgEJ80aN81NOlpumlvOuCqhXV1c4FtIhKJccxZcyKVfiVumLsovg7PxLmkOPMP 3Zj91aPViBTP6xDiZyVvqY+97PdcEHmW9w5LKa9mhVPGEBJDkFACCVC2SHvh5okz5Whn X97MitQGnGAnPScsoxxEYzPW3Io0u5oJqfRgmDRCSQkiiNOqlj0EvrsLZ56eXPscG4Zc XA5VqUxfm60EEv4k7FyCDjK1tFQixUSr0CoNHgtrrpKQsx2Iu6Vc3kPsh1ziUqeQe4q3 GjdzcaJw4IMikqsavvB4rFY3pY9HQO5HQVVkR3r5jfb9ps+tLpl/gQrM3cPsdjhaPGoV xB5A== 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=us2v0oVZKl0QIwN3HA5w9+hxy9CSy5yV7oz6K0dyghU=; b=XEc0SlQY7X/WzJJMDpx++4DMotuRwangpvVlJ7TdTBlbRWW3jwHJ7on/iqoPCOTU2v A4EHBe8A/gKxEHKZdVcvI/XcJ524Mm0fh6XhlyLZgR1bx4+rYShv3l97MMGqk+ZpZ7KJ r52hUq+V1xCZeGSR/Hc5f0dlJnWmhMavtnYxCjkFs42hTC00N/zKiUOtn/XGCHsJO5lR E6KyYBz5Z63nX2OEf+oR0xIhTeoSreXIx+MLAFE/odUuITe/xb61FKzlWgmv3VEtDKO4 pASDTQVUDp5EyrXxzXr7umtDsu5bg9LsxNzgr9YFwrlOkPlMjC7xQMran6XAcKCMve+1 i1Nw== X-Gm-Message-State: AOAM5331cCbah6LQ+Se6nkH8BdrpPvoUwe1Ohw452SuT6fWiTFKBZMFH Gz2EaREDMmGf7xDMUmt9Nz/DuY7BGfw= X-Received: by 2002:a65:418b:: with SMTP id a11mr3656806pgq.620.1638765925738; Sun, 05 Dec 2021 20:45:25 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mn15sm8278289pjb.35.2021.12.05.20.45.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 20:45:25 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 12:45:01 +0800 Message-Id: <1638765904-2521-3-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 3/6] avformat/rtsp: use MAX_URL_SIZE for one line parse 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: kffZEqWXMVPn From: Limin Wang The buf is used for one line of sdp parsing, so it's ok to use MAX_URL_SIZE Signed-off-by: Limin Wang --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 5cffe0b..3e4a68a 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -709,7 +709,7 @@ int ff_sdp_parse(AVFormatContext *s, const char *content) { const char *p; int letter, i; - char buf[SDP_MAX_SIZE], *q; + char buf[MAX_URL_SIZE], *q; SDPParseState sdp_parse_state = { { 0 } }, *s1 = &sdp_parse_state; p = content; 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]; From patchwork Mon Dec 6 04:45:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4096030iog; Sun, 5 Dec 2021 20:46:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRmQEwuomsErVaiApgsnJLUBh9ADUrPulTMihpqp3q6KgkHht0XKDcmTFwA6+cjHD0/11b X-Received: by 2002:a17:907:3da3:: with SMTP id he35mr42280092ejc.464.1638765975433; Sun, 05 Dec 2021 20:46:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638765975; cv=none; d=google.com; s=arc-20160816; b=ksiCH3YLN14O2rwVXOCix3/iWfe3q+3UBq3N8V++M9zAxsYUgHOCb+/qbfSjfVsMt/ MpgCuMt+kp0ZP/Ttk4Phz40gWEohRDTmvCT31bJdwNdf/bbmmm3D21TIszk12S7wVgSP 2LO7tJ3K34hMUHeiqVoyw1u8iMLygePQho2wym2OfONBqKrnYRFe9TVYBEutc9sNwqSD Y+x6CAJgVQg9bug6y+sHmHiF47TzGJPjhP2L8spbchLpz6jVc6NJu51ViIMHfWVtbWGu i7FYL48bZYo2dgogWABJQlOovtRLh71hEyYOcqoi5djyW79NLckgpyMspOWNCUBRi+KT Rhhg== 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=hkVHUA7ZHF7t4FG5ZQ0DrBOIVD97nrrmqn/RJfP93Wg=; b=r5yIyzIFZmx0Gt/56Xbgl/b7Qj0SxxRVZJ1jYj1KhJ20+cCAISjgO+GR102LbhaFxH KeyGUR9ZS4phLx3o0TqTjeuZjDU6AdRH1S+4mK4oGNXniQymrSJQTMWBMcpV4MudJax9 z7pY1YuKyYpFgX1P3/18t7qVIp5WFeuK+aEH+MH7Sp4Qp9tyDqBg0yNvs50hOWc9q19J jsStf5JPNRbsrCJ0h8UMmEvDKP8jYaDOE4u1ooezm24xU9aJV3AVKjBHPpfmthE5r3q7 Sbnx496A5jmuXq+9myuIEqV62EVBDs+/5/9CWtvKkeCAgNi4LLao55KHjC2AFxHRzx6T yooQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ht3wUEYY; 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 l11si19764287ejo.694.2021.12.05.20.46.15; Sun, 05 Dec 2021 20:46:15 -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=ht3wUEYY; 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 7B9DD68A920; Mon, 6 Dec 2021 06:45:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D028868A8A0 for ; Mon, 6 Dec 2021 06:45:29 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id o14so6280001plg.5 for ; Sun, 05 Dec 2021 20:45:29 -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=+iKfSq3Rv/GwfkssFeiYcD7BBCSYnDjyWsXMxxAm8L0=; b=ht3wUEYY7cS4SyQEriJRlUJjUUAeQ78V5xeubsbDcVjTxS7gfeLnJbHLF830P7nar5 6LB5rwR2Yzsg1Nnvk98DAPuIbhtb1053cdr0Dukr/fse9L+U6ASH5sC8LP/hGe4gBppH lGm13nUGwonpcM62BJgzF2HbZStMGU1BW7Ke4UvmfG3t0HBx+3vyWazdUqhDIrkpZByr eNo6/Q4UXnz0F7XP9Db9QUGQ22ii+zXrfM6qqdbA5f9TmdkXFn7z5zQs5PfZryzcijnQ 1ovkZkdiqpFIkcHhCyXoHHwUAxfmvVwULcaKUEHO4UO9Tg/oUkKMqr8oWxoBixF8Nj6d nVYw== 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=+iKfSq3Rv/GwfkssFeiYcD7BBCSYnDjyWsXMxxAm8L0=; b=WUjfDU3HfM57VDNIupO1VcDO0Imiyesrjsqz+NOOz7Sxmk4PnNHjwsIf+PWRx2O+/V cGiD8wtEawO7hj7fUzryqgI55wxl8GGZJL9CmiLXFkaG16K7p6nzI6KgE6DliTDCzi4i 2VPGMP0VNRQysJ8xw7Wd3kQT5i17a0acxmR391ApRhDyfmrJGfLrEBm0s20XavL/arEh vshY5AfDNdXQI6tt3v+l/7Gh4EEbsGjQGiJTjhjDiV5rvBxRbFoAI34/F4TsqAge9Uf7 /CSpqIix4s1wdkzmPApgURsoR34AK34tOIopkdUpJglYGHr/CHvTJ644vPbRXNNwnH3B 49CA== X-Gm-Message-State: AOAM532htC+BANp8K70wlPKe6fYAndbT7PxMlF+rVbbQKSBjy8/3nfpL Uj8bbt1G+vOCEGQD9QSYG7YuoLTqYjU= X-Received: by 2002:a17:90b:34b:: with SMTP id fh11mr33829439pjb.14.1638765928153; Sun, 05 Dec 2021 20:45:28 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mn15sm8278289pjb.35.2021.12.05.20.45.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 20:45:27 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 12:45:03 +0800 Message-Id: <1638765904-2521-5-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 5/6] avformat/rtsp: add error code handling for ff_rtsp_skip_packet() 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: A/sKmFv1a8IG From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 15 ++++++++++----- libavformat/rtsp.h | 4 +++- libavformat/rtspenc.c | 7 +++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index b3d1e91..4ae810d 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1145,7 +1145,7 @@ void ff_rtsp_parse_line(AVFormatContext *s, } /* skip a RTP/TCP interleaved packet */ -void ff_rtsp_skip_packet(AVFormatContext *s) +int ff_rtsp_skip_packet(AVFormatContext *s) { RTSPState *rt = s->priv_data; int ret, len, len1; @@ -1153,7 +1153,7 @@ void ff_rtsp_skip_packet(AVFormatContext *s) ret = ffurl_read_complete(rt->rtsp_hd, buf, 3); if (ret != 3) - return; + return ret < 0 ? ret : AVERROR(EIO); len = AV_RB16(buf + 1); av_log(s, AV_LOG_TRACE, "skipping RTP packet len=%d\n", len); @@ -1165,9 +1165,11 @@ void ff_rtsp_skip_packet(AVFormatContext *s) len1 = sizeof(buf); ret = ffurl_read_complete(rt->rtsp_hd, buf, len1); if (ret != len1) - return; + return ret < 0 ? ret : AVERROR(EIO); len -= len1; } + + return 0; } int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, @@ -1201,8 +1203,11 @@ start: if (ch == '$' && q == buf) { if (return_on_interleaved_data) { return 1; - } else - ff_rtsp_skip_packet(s); + } else { + ret = ff_rtsp_skip_packet(s); + if (ret < 0) + return ret; + } } else if (ch != '\r') { if ((q - buf) < sizeof(buf) - 1) *q++ = ch; diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index d6fdfe0..8b64e29 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -560,8 +560,10 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, /** * Skip a RTP/TCP interleaved packet. + * + * @return 0 on success, < 0 on failure. */ -void ff_rtsp_skip_packet(AVFormatContext *s); +int ff_rtsp_skip_packet(AVFormatContext *s); /** * Connect to the RTSP server and set up the individual media streams. diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c index e0fed1e..2a00b3e 100644 --- a/libavformat/rtspenc.c +++ b/libavformat/rtspenc.c @@ -200,8 +200,11 @@ static int rtsp_write_packet(AVFormatContext *s, AVPacket *pkt) ret = ff_rtsp_read_reply(s, &reply, NULL, 1, NULL); if (ret < 0) return AVERROR(EPIPE); - if (ret == 1) - ff_rtsp_skip_packet(s); + if (ret == 1) { + ret = ff_rtsp_skip_packet(s); + if (ret < 0) + return ret; + } /* XXX: parse message */ if (rt->state != RTSP_STATE_STREAMING) return AVERROR(EPIPE); From patchwork Mon Dec 6 04:45:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4096181iog; Sun, 5 Dec 2021 20:46:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDakam5xbbWQ3/FQlyJZkERu3vZOuD4fvNlmvjKV4HBFKukQwwyXC9H1XXN3t5FGR/mcX6 X-Received: by 2002:a17:906:794e:: with SMTP id l14mr12598250ejo.179.1638765984987; Sun, 05 Dec 2021 20:46:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638765984; cv=none; d=google.com; s=arc-20160816; b=yCyKmm+BX7qsSQQTZIk/403FxMGAMf22ILBXxOdf/D9lPMwUaxEUAyRVnM7vuGWQo0 vXIpuMmAwroTS2DxZ0pb6gph8FyfD9HZFtLfB2ljVgtRm+Rm0++gjACLZH6FEwn2hfye DnqOS/R/xG/bLsPsnOgXobSDr8DV30FJsvLQ10uXhW8VjpQ781J4auPCcCNdconAm6BG sCeA0iok7XZUY++J6fSyBHcuzlt9ZcjLgeCH404/Ob043yivr9+wOPHa5gSf5Dpv7Y/1 peLb5N1Z6N3OOVYSrfc1UzIFU93kAG9rCyLD7anQFxF/efczXLZ//EZgxYYbNk0hvdTm lqNQ== 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=lU7W1HMZSI8FD3Db81SnIuMG3gTH+THOYZ//oTSN/uI=; b=fwUmQBAj6Lh5r8da2ED6J1VJxLWc7v3q+fkrYg91IVCGMXvkhQqXZ/W1BFH48+0kzI /le4B8/GYWqfCW8Sb6KbXgJ07auzEtMk9CwREqWa622Egsr2ng9mH2Ikj4uHERSSxZ3p KGIlAv11lwZh7m9N1s9vtLFRJc8pIYDInJSTripbp2/kXow8y23aPmoZ/xWGwCng2rF/ KZLw/lpRkEnTIQjC6Nepoizb9tyu5xOeTTl0l4BQBjNUMWa3MJHZ3BmE6ooSCQJiF6/6 DsBt/PJxTTvOzFKRyQGfpmRGPF1YzIkQ1PQ/k+cpFOGzppyv5ISbp/q+NjJfcJZ/vQfh q0lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ej08TrC1; 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 d11si17190592edn.463.2021.12.05.20.46.24; Sun, 05 Dec 2021 20:46:24 -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=ej08TrC1; 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 85EF768ACF5; Mon, 6 Dec 2021 06:45:39 +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 045F168A92E for ; Mon, 6 Dec 2021 06:45:31 +0200 (EET) Received: by mail-pj1-f53.google.com with SMTP id np3so6757717pjb.4 for ; Sun, 05 Dec 2021 20:45:30 -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=J8t8w6hVY7vaduZUzT75qBT/zrFeXAOAAipgzOgYhh4=; b=ej08TrC1ahSaWqxTK+FQlTHI4d9k5aM55OyW3HkbpKyvA/sGQEqab7lpdeGp1w2ip5 6feQlB1/h276jwPKcsbwOL7yPIRAALGYHcezfEkXpvhJTsYxPESCynLw3Wirqd16N3PV XevNg8oo1LfjCYFcBk/yWCV/s/6yf9DxoV1ARkiHu/AVEDLQOTRsLiEdrWu9nAEIJJ8z GGA9UfXj4W5Cw0RHv0E0NhC4gUm5FLQsNywRFcryEg9R7XceQvatacy4nhLYUrCqs9hE Q2gl5sU3fKI4ztbnsFILpOneXMoayWarNpraPCNdfQEZV3/R+Q8N4jK1bZQvZZP0+rCE 9hpA== 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=J8t8w6hVY7vaduZUzT75qBT/zrFeXAOAAipgzOgYhh4=; b=R1er7P6LcKJ38wKPYeNePfIC+OG2MHBrJCMeSeRv2nC2F+dNujwPtx2ef57IW6Z0GV mQHMyToyREPlK+jgliV+7cmg9Z+t1RB6Qf0+Uj5F3svg7Cx1x0LANZGLGH3dElnaubua P+iR65mrzDHFAA2covzwgQ6FjVG19DjQI8xJgI0Rzd3ZO+3566VChDVOcOSWYXR9MSs5 WtzMtxBCQo0jzP3+NzHG/ANIKF/K3e8H6V0f6Z1jaQbfrRi2mGNPeS6aAAS7RfQ79rDA e06oP9RS2VWftwvSZ6usIlDva5qoPptraGJabSCAOdhQdD8dCwjf2QVs2cbzBnzuq+/f /WkQ== X-Gm-Message-State: AOAM530E2PJRVMKjNfyQegs++6MHliWnEKWg2vcAySYdgTGvEI4cQeqL wglhdMuA2tEeAGgnYDnm0BZ1yNwbnVc= X-Received: by 2002:a17:902:db01:b0:141:ea12:2176 with SMTP id m1-20020a170902db0100b00141ea122176mr41610316plx.44.1638765929326; Sun, 05 Dec 2021 20:45:29 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mn15sm8278289pjb.35.2021.12.05.20.45.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 20:45:29 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 12:45:04 +0800 Message-Id: <1638765904-2521-6-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 6/6] avformat/rtsp: fix the error code from ffurl_read_complete() 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: ryUs6tsu/CxB From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 4ae810d..c591664 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1197,7 +1197,7 @@ start: ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1); av_log(s, AV_LOG_TRACE, "ret=%d c=%02x [%c]\n", ret, ch, ch); if (ret != 1) - return AVERROR_EOF; + return ret < 0 ? ret : AVERROR(EIO); if (ch == '\n') break; if (ch == '$' && q == buf) { @@ -1250,9 +1250,9 @@ start: content = av_malloc(content_length + 1); if (!content) return AVERROR(ENOMEM); - if (ffurl_read_complete(rt->rtsp_hd, content, content_length) != content_length) { + if ((ret = ffurl_read_complete(rt->rtsp_hd, content, content_length)) != content_length) { av_freep(&content); - return AVERROR(EIO); + return ret < 0 ? ret : AVERROR(EIO); } content[content_length] = '\0'; *content_ptr = content;