From patchwork Sun Dec 5 14:26:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31977 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3323728iog; Sun, 5 Dec 2021 06:26:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfEvM25SPpKNaEowV+KeLd7ISeD0Ug8B9cNAGsnA3fXGpG+6c2qDRLNcgIbc9MMfGUpMXa X-Received: by 2002:a50:9d48:: with SMTP id j8mr43196499edk.192.1638714419022; Sun, 05 Dec 2021 06:26:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638714419; cv=none; d=google.com; s=arc-20160816; b=cKkNIKOME3x2zuWSkdbaBTUHV4vDiJM5fVEodjZAfglbARp4FSipfP3MbI9brEoeCa 6d9A/Lr6uP5D0RPEruweP4u56qRBbjV301S5i23ZbO1Bm1HovgtvF5wjQFRKLsYNzS0c zFS41IFFVNRFnum+fnA/7JWe2URyJfPvLLCnS7cgSHG77S0tvC5bAei7O6wDhZtUc8nJ zi0nnL3XpflmfTG/TiMAUhRKuDiTxAH2QPiX8XBSqROAuMQczmRTjJbPW8i6D9q6GmJB uU59QLGaz5IcdqveSsXGrlT4JA8SJtI59z3oOz3lk05crLNblr6txQpTfGRWvwmc4XA7 20Zg== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=MDGW8l5H2kxGXzWJDhXP0ceam1v051TzM2h7+2B+4tM=; b=P2PNPTlaheMt3ULjtZWFSKcQokvGfyT+hmY9Yt9rolpUy7PiMErr7qNzipRCsKA3Ia msPV98maE6hz6hHfTPiTtyZGBaxm0pSPVXVnjy9TLWuhWGBW6ZcN4maVG60hlmYMQkG4 /dNlCmXdhCSjhOL1yHosYcUK0Vn8M+0lV6NxGa3IG/GbDAQaqmmY+Gb4z0VNHqayIetT WMgBWcypoh9BxEGLr8Gjd8ESq4WLKvm51/syyW2zP7vhpmPEcy/malVK4dVclCB4Sk14 MEiF3LZmUn7LT9d2isFwQdmracA6TmdqCAreJpy7AyN/28uTCmSFn23PBUbTMphShEjv yC6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DZ5iwj4L; 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 hd42si6287258ejc.443.2021.12.05.06.26.57; Sun, 05 Dec 2021 06:26:59 -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=DZ5iwj4L; 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 36B4A68ADF7; Sun, 5 Dec 2021 16:26:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6D0768A773 for ; Sun, 5 Dec 2021 16:26:46 +0200 (EET) Received: by mail-pj1-f47.google.com with SMTP id p18-20020a17090ad31200b001a78bb52876so8820207pju.3 for ; Sun, 05 Dec 2021 06:26: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; bh=FhwSZ1DlVue9nDCO06qf0vn7f+jVcsylwPe1L/ZwSew=; b=DZ5iwj4L8YxbqvSqHZUU6PXF7dAPJxF2te5Z5MwfwwF4R8PXS4KLExHOdhaE5UdpkQ RyjTN95E31AfO20qEoJMACWBcpbNWZPWoNDOCyh4qevQmIHHYOLOiUo2WP9YgSkXjbZd Nbbls+wbBHHJr8dV/1rLn9Z5hAs8iqLSZkmjgtKxXUBGVC1gqh8pGelwlHurj2tESoR8 B3UknCTzM1+ckXvAVJysdIWWD8Yv7gYDHUkTd5rl4W7fPr7Aya4ZnNs6u9SID2iUzMPE QTTaQnLZfZ43nnkAutkkBhsFTnGBujK7Hop89MhDQVmb4X32Y7Z8qKs/360/Dl6xiPCb GwQw== 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; bh=FhwSZ1DlVue9nDCO06qf0vn7f+jVcsylwPe1L/ZwSew=; b=p/bJmGOTN446FwTWnTJpz+C+ooKulWz9Zy2zcyNW/mogLfiEBcO/Cz05y6nLIciBxQ 06mEsEAY2zuRTW3o9C0gDk4CDxhyJvml6jG7DktVsXIQ3E631zyDtjeWyRTFLtYw6qaJ 2R668Ut1JCdY+aAzp+Z1ZrvV2xTm6NfIvFkQkJFAacM7FWklsSD3PCr2Y5Q6tmNoo3fe 0xWp5e7sK6EH1NOF2MKmf+uViu+545CKe2aJhi27p1YM5yuRC9qXNm5gVpyYQENp5HNW r8CBezTknndz+lcvGhnbHfRYxh0Qb3WDPKWFNv9GZO0D5S744n9JQ2VeP8CaFeASFwQs GZNg== X-Gm-Message-State: AOAM530Ytpug41AbUTuCsmJleBEoyqu8gESaMkA+r+RQy3hBiKvAPx1f 5lxjXmT/LMv5QsoAVxbQ8XJfmla0VRg= X-Received: by 2002:a17:90a:800a:: with SMTP id b10mr30095347pjn.162.1638714404557; Sun, 05 Dec 2021 06:26:44 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x9sm10192265pjq.50.2021.12.05.06.26.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 06:26:44 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 22:26:31 +0800 Message-Id: <1638714396-23062-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 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: isfZ3VhBqnTV 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 Sun Dec 5 14:26:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3323908iog; Sun, 5 Dec 2021 06:27:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8wzXymxDMLjUuvBGdqZZA+SLTmIyM+iEoxJ3hGaSxeGEpY/FWurm1/ROZyJpmZ5FrDiW4 X-Received: by 2002:a17:907:e86:: with SMTP id ho6mr39435751ejc.209.1638714429564; Sun, 05 Dec 2021 06:27:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638714429; cv=none; d=google.com; s=arc-20160816; b=fgx0FrxwUwBM4Tjy2L/C5DUsl6Q61KLOlBskwcwAx1MJ25ryP8YSObAOGvlZhbnq3h yCzFKY9WNxt1DrL+SdMwangKwsfeIEjQb21f91bgXXkoYetEQalK8sEyH2aL0fCS1L2L 6t/so67fyFHOIzkVmQP7VUM2t4xXxdNmhEN5vgYS2O7i2rkXwOC/rEqg9Aw8R7QG+qlv os7mER1RLSdJyjntXEVtebKUc4w8XPvXzaYrTHmPuhgSP/hjcPpKR9pD4bYAD73yDh6L hTe7lJGaUabZiaOdK3HQyxy0+rqmK/y94PtlO1GLn4/LoRZYICvb3f+KKohdmv4CKBQW Vd1Q== 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=d3X0bYm7u9P1hJXmTIOJR0UPqCwQJftCIzHrrKD3cTW/kWjrFH841gdh1AETpEqxfN EB+qYPa9nClqRazzR/pdZHW/LlDCa0WHD541zxD1C8k8IkBXXKsXwvZc18PUNHvtGVvC uBPBz7ktVpU4ka87AURe9NhnbSn4QZll2YyT5X04PhvbrPyndNmQDQKoLqfmka/ViiEA 5JTP98l2rYjg21WnQwiIssyZb21uiPHKD3TxseD3hp/VKr74b3+VHDnjCOSN6XJeNeuC lit13yokMrJfileJ+eoesQ3wjcKfw1BFliTNpdZnckgY1ZiOnQ/BYSda6jm/eKhriFIy e+Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TPUCvRt2; 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 c14si13650275edn.629.2021.12.05.06.27.09; Sun, 05 Dec 2021 06:27:09 -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=TPUCvRt2; 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 672EA68AE33; Sun, 5 Dec 2021 16:26:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92A2E68A773 for ; Sun, 5 Dec 2021 16:26:47 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id k4so5374934plx.8 for ; Sun, 05 Dec 2021 06:26:47 -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=TPUCvRt2mWUAiYu0fI8demnBeUFXsQuvl7Pi5Ca5bhLxomhigaz7ktYEwKLztUrYOr zkyxPmkgU+6NMB21j16vVjKkCTq7hpgG5cM5k06ygbbsUcf+Xi28aoXVx0bewBTXHURw dnAoAAcKWAa6awAWPWdg21IIYm+/Bw+wbIQEY6lau8dojtIp4pcn5zyJfdP1bQMnSDH5 mgGDllsW+/8JzgIbXr7g9TwFOGmkVwImCn2sMF/WI57qU7Yi53By0QaDAP9a8WoocYuP eWVWe/gwnMQ3jlAL17RfBCTVXUW76MQzkwnLMENnHQONAmUVJmHY7uPsin9xNTVDdS4H 92lg== 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=dOigFB0+/7ywVG5VCkokdHuV7+TrAj0v2g/ql771farO2R5nkl7ZvI9RBceeUecop6 pz4se2LqOuGe9dkn/PvQo5EVU83uWBslAzmKJXNcTScz18AHm+6+rbDoKoex6rb83ZfP wQUCrMAtgrQ0TtQsL33tV9b4dQXGW7o0R9O7JvqLKdaVOK1aIxW67GcEKtlahW/qdNTI xLQc8DYZc2WXk9n+QnWKFdC7tMzPIWN8F7oYULK/e+j90AjGYb/rHpaMGTEfEWMQoHau ZEeUA8hl04HSy3tozZDYk6RgDLdLIsigh31qXQBJeh4HHWgOgWhZZ98I+UWiSuZIWUQd dTDQ== X-Gm-Message-State: AOAM531oF3bmolfG5ykTpXD+vZzXZER7uMovFptGcpCMkyEjHgzUIUpt 9lcCrBbzldUi+w0wmjSQwCj5YzwlQzM= X-Received: by 2002:a17:902:e8d7:b0:143:a088:7937 with SMTP id v23-20020a170902e8d700b00143a0887937mr36752201plg.63.1638714405745; Sun, 05 Dec 2021 06:26:45 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x9sm10192265pjq.50.2021.12.05.06.26.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 06:26:45 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 22:26:32 +0800 Message-Id: <1638714396-23062-2-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 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: xcWg15keaJQP 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 Sun Dec 5 14:26:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31981 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3324061iog; Sun, 5 Dec 2021 06:27:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyoJgpNIKO73aLtRBx+TUNVc32eZSezFoIHz+zLHLVGJI11ggTA2kFJrq35SZ47OAR1Ofl X-Received: by 2002:a17:907:7215:: with SMTP id dr21mr37798833ejc.505.1638714439358; Sun, 05 Dec 2021 06:27:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638714439; cv=none; d=google.com; s=arc-20160816; b=VgnNclnHYvdlyOL+ppgQvhWDBagTc2wB5Y5AS9aedxr9o5zEKd2hwjlpj8unODSFf6 XEnGilqksSFYdIKjJJPe8oQYEkPA2mratsNZcQIRI2o0xlwIT8fIViiMAx0OC/NvpEj5 Jp3wpOl2j8gjVkcaqK4GewESS82rposkzJVCahoFCL3ct3JcWcz4DI0n93UuaFsWR37f nVsQalLjDTH0XgStwcGD7lwpN0BCc9A0axVdtD7bcn9RCCAuVXoJ/RHAmyCKS2vX30Hi Fm/jDMkfBbYMJSK8IW08vkSz9rw1Lq5EJvzQ4D0Q4GcqvD2KR9H2ZA/hmZukYUkR0q/l EQVQ== 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=aAZBKTdSwmWW3Arg61+yaO+MBjQrrBqpIbe4yTlZSwg=; b=in55iHxKHeAhZzB1vD/OuTtP6N8NOjdZiQNUEFE3FrIrPOrBgm2YixN5RaZk5+0+/J odHHyVBfzSgqPS4BCOFFnu+mYTkGvQqnupUcdynNbQleyWAZqel4P4WgrLLl2J7X1n5Z yBywBqow7/8GDaPuiKk372JoIGiCUodYzTr3e6pSvdW9xV+xY9KwCoDZSZ2iqRPSPH/H L6mAK/68PCalhNYGqdnhO0PUqXcA9PwOnijEmptfRSTQYcQCwtOvgsUuqMlmLpwhGkQ8 W379FvikANFcczqzCG1HdrGtqGLnBSLyUrWzII137ul3p8GMZmgQW9VWpiOFAq9778rp UpAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JoMj7TQ0; 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 cr14si15184187ejc.271.2021.12.05.06.27.19; Sun, 05 Dec 2021 06:27:19 -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=JoMj7TQ0; 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 8B22668AD8B; Sun, 5 Dec 2021 16:26:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3E9068AE21 for ; Sun, 5 Dec 2021 16:26:48 +0200 (EET) Received: by mail-pj1-f49.google.com with SMTP id j5-20020a17090a318500b001a6c749e697so7808131pjb.1 for ; Sun, 05 Dec 2021 06:26:48 -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=rKpV05RkMXZTdwZQsoS7npQDAMywZe3PUdX4hPvbyho=; b=JoMj7TQ0brS5qwmzD9QU1uxROaH8JDseZWG8WvxSbORIYeeMwgDfrGNFJkWGLtonXs JxbX4QXLAQCDeg/E8oSYTVeK3CLpCF6Ws8tcH9ucjsedwKm1yim/FUH5yL3v18ygOph+ Y7bMrW+Z5lLNjz10ciPqLMdT3bOEvqu4Be4Cv/3iZi9HHYJTwHCI0RNTCOa7Mq/wtMH4 jEi7+egrxjpRcsATtZQzFWg6nVTx/eDgFjoeFeKgwLEa/icQXUphDarB5f9wP7A28Gd+ ddK30Mmfoa+abVm/dpcLXpGe0sfYPMoKMNMCr5PXRyF8OMPMMDL53qxpSdDcJ3Xy5+/A dh2A== 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=rKpV05RkMXZTdwZQsoS7npQDAMywZe3PUdX4hPvbyho=; b=DSHy5h3GuHLQNCXTDNWzHq1LSZnd3Ze419dLY7FCEBzBcH38aSeRmlUVjvsInYzxKk A7rrVThBgGZewFTNMUDwSqljW8ZnTkwX3AWjo7ippvrq0SaUXpbQaiinKbv1GjD373Kg 5A02A2TuY9ieqSgWzl1M+PJFSQKJoUMtC1Tiq2tPXiOJf/PzaF4rjeRrPOSMhgx7KpbP Xfty0RSred6KemCtngS1qDNyLKjfgfi7mSXqi4PSA5gg8NLSI+W1F+62WmUOmy04KMSh ZvQYrbM3yWeH1LKyChoznQzYDdGoS3fcvFosIJx5yOIyjMgYNDPP2Ddb5dXKp2BMDNcP Cmlw== X-Gm-Message-State: AOAM531Y93uI/236PATTxrN1fIfa0W2P0WrSTVu2vNjUsMEvwcbOoG0x MuvmrhClC4cH0/FoDGRMORj5ekqGmzc= X-Received: by 2002:a17:90a:6948:: with SMTP id j8mr29612112pjm.29.1638714406970; Sun, 05 Dec 2021 06:26:46 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x9sm10192265pjq.50.2021.12.05.06.26.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 06:26:46 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 22:26:33 +0800 Message-Id: <1638714396-23062-3-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 3/6] avformat/rtsp: prefer to return EOF for incomplete read 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: j1ZwSVnGBaNO From: Limin Wang 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..2ee2463 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1247,7 +1247,7 @@ start: return AVERROR(ENOMEM); if (ffurl_read_complete(rt->rtsp_hd, content, content_length) != content_length) { av_freep(&content); - return AVERROR(EIO); + return AVERROR_EOF; } content[content_length] = '\0'; } 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]; From patchwork Sun Dec 5 14:26:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31979 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3324424iog; Sun, 5 Dec 2021 06:27:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwf0ip2wupVY8KRdSHvNp+UWXdwk0SXMjpfvzvlkC2wsZzPxAH1THdQzgchbTSLtJdz+yg5 X-Received: by 2002:aa7:d652:: with SMTP id v18mr44776556edr.68.1638714462215; Sun, 05 Dec 2021 06:27:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638714462; cv=none; d=google.com; s=arc-20160816; b=ZYXb9JMQJDXrLruzze9BX9OagYsEtI2+D8z2WTJY+yPrxbfMEU2eDrGmUXjKuL98Dy iauLOH+Au47Jc7VjyEw/5Qq/kw0SqgkrjSJfrt5SPqkUUqrSFEsU0pIlgSgz4t9+Vclc 0Rve424hIhUgJcLn6lSqm0q0cx/kj2WrreFf2meDb/kBrm0oCsq68WcCM4nu622R9nVk Rn6WTns94d4H2yrZZ5RzQFqT8h5VGoysTbqKupoEXyASnEHgGJSh6Lu07tBg4SPYQZGU sHWTSQTBttpfi2TCAqG7MNeZgJL8OJOkFe0/qZt2ItslEHKoXDFGcvJSYiaIoFOf/Ncf qgmw== 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=cZY/oYQvDP0p5K96I4M33Xfl3hRKA5Jc+iLZIAqDAUs=; b=AR5KZBXYmpvW2DNzZ9tHHh9+aVjYsLKRtQmxSMraJqRMauxQteaNbfi6AW3K4kUEZM lHP8fnAYKUeO8avIbXLUUhHkOaZzBLm39ZR97eXitnLiqanoIabFuB7zV0XrMbx3qnz/ giKyVBoOqsr5Zz8+1vfZM+Z+QGj+75qUDlX5OZaHh2NLiv5CWZEuna1VDmot4v3AB/H3 fz+CF14mdY7r9h/99HaRiQyr3RoDL73nMZ7Z9oMyJ0iiM96Vz+UmvRR3pNAVFYL5TZpt uG2AqXp55PsA057Cxg+1jMKxmFktpSgHKxJ9PKRZKKPfU7NFPic06m467VQt8BqDP/39 S1sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AsR5sBfo; 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 l7si5641699ejk.686.2021.12.05.06.27.41; Sun, 05 Dec 2021 06:27:42 -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=AsR5sBfo; 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 EAAE568AE46; Sun, 5 Dec 2021 16:26:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D081689D92 for ; Sun, 5 Dec 2021 16:26:51 +0200 (EET) Received: by mail-pl1-f176.google.com with SMTP id m24so5357612pls.10 for ; Sun, 05 Dec 2021 06:26:51 -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=I/cHeM9lpiG3WTIq7xByBBjBEMKc125p79tpY7DNYuM=; b=AsR5sBfoAC8feiMb26Z4QE2uoELv5kSiOHRnADUYazukb3T071ydqzOjGcdgEmNMxc INL5R6QlKp5DfX2cxJq/7zsL+N9e+jKouTm3WyLokjc65aS+Z/AK58HXpcAjlIrEa+sz Qud5bkRk/IyP/xQbaEbjPGJMNyewW+TMH7siSJWWuzx+vnl/0xxe/DfoUYLb9VjXhJVg s2FUJIj+XKbC+46R1Bkn/2zpXox1ThzZu5Y0U1RgjijuEFTQqcFtJcAPrzTwDz1C2l2b gfJPMES5OBttOG7ISCG3ZQ4vNRw5f+mcOycBLa9arl0VRsEqaWAnEPKcOZxxqBniJH/E Awdw== 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=I/cHeM9lpiG3WTIq7xByBBjBEMKc125p79tpY7DNYuM=; b=i2eHMckpOXhdOA6CZRsLDCnurpETnswXctGP+xpG7Ee8va3QtC/PnGE7jHndwHi+jv YZcj4KKVBRl/aKcSqJrkyNYqo5+FV+Xpxzya8HO1ZRFy12fl2tb+TmCDvQ6HanIVxxfY No75hD41vTK2E5jbnIvwits+jDMjYOxwSnn4OUr2I6SLJvi0bt3Y7BKZ0dnlwcqEGHrw P96QO/SVrkzonz2IuR8ourl9ogYrNs1ipOo5bT9JNJ4TPvscZqzo44WuYIMeUPRUqDog ZMFXZcnWy4j/UEdzwgdj38BKjKEVFZ0hc1u7jPunhUDIRVePbAhUvdtM95MVl0oGVM4m syLw== X-Gm-Message-State: AOAM532u4coR06qpsAnmTuzLDbUVXnAkxZGEjX3iyadTgY/Ut89Vrx65 9z4flYWASfMyRe/4RJ/pVE7BPg0n4Go= X-Received: by 2002:a17:90b:3890:: with SMTP id mu16mr29775877pjb.186.1638714409484; Sun, 05 Dec 2021 06:26:49 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x9sm10192265pjq.50.2021.12.05.06.26.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 06:26:49 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 22:26:35 +0800 Message-Id: <1638714396-23062-5-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 5/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: XyEm63htDQNb 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 233ed16..a8d079e 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 Sun Dec 5 14:26:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31980 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3324559iog; Sun, 5 Dec 2021 06:27:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwY2eW2UpEEMnwMLpg/ElDFtcPah5ukFgcqKlfVm3HF0MAE2pDo0tlmB84pW5QVlD2L9X9v X-Received: by 2002:a05:6402:27c8:: with SMTP id c8mr46034299ede.151.1638714471455; Sun, 05 Dec 2021 06:27:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638714471; cv=none; d=google.com; s=arc-20160816; b=imcbxE9XEMYeyaAYRqmbEDOOf5ZkqpZ7DYWmkdSUnptJX7zH7uSa1dHxrQnIPxSrT7 QToa81oAR7rlveAVhtNaxwFUD8Q2zErZgNEDAQOiRb5Y05SnNROQKazzJbJzhllp1LAS +P/23+u6ZJqM2p2adfYMMvuKZhsGwqdatlQef+2aYX5mGXkKPEQZC4rJi2iL0Q5fwtwd p47DWiCZOahK8f5BIwqrvQLS+DBdsL3drshNRiR8I4kBFrIZHOMsKLp5Vj0VxxbL2jQK INagm1pKmk2Lez2UlN2NnSMNcThwNnNe4tQy971bzmjscPf/9tRuq8IjZr5nJL6Iwffj 6caQ== 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=ZIE8XGQ7JiSmtJqsxtZHsr9cNbaEGVSt8XDer/hebNE=; b=xKWoHzjPLSUUCb1rZxctpHQwzIacqtEKiQppiZg8/rbstv093BXm+sc/khmkbVdZ7E rdiEpzbKCV+K0z+5KKjhfuG5v2JMDfw7VK5WSoO4KWWsRM7uDgtbJVUyWMLGWd6fdGP/ tCcKTUJZDkqKh71nlXcKldd57NfY4VRoQ3nNhf6STAdDeJ/f32CR1xMoacdlEJU6S0Bu BfEL6kcR9TvIg+FZZX2gWKSXUZ9LJL7UxnT6gibqzHiimFzi2ePqqquELFCpTWQmFviZ pxwM1pw7MswZkUXUG6D/Xsr+1Tv3LOvJrft8QAtNvq65qzz31hv+421wTh0a3KSGS3wY yQxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VcM7h2cl; 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 x25si11883879ejj.243.2021.12.05.06.27.51; Sun, 05 Dec 2021 06:27:51 -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=VcM7h2cl; 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 F099268AE80; Sun, 5 Dec 2021 16:27:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F3EE68AE57 for ; Sun, 5 Dec 2021 16:26:53 +0200 (EET) Received: by mail-pf1-f174.google.com with SMTP id b68so7683302pfg.11 for ; Sun, 05 Dec 2021 06:26:53 -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=6nODyHSCeXvoCgob8pb3aTn1fdszXyOayOP1bbhfjkU=; b=VcM7h2clo3sXs1eqOeNLypwdJkKpJ4bKDJjrGaoPI/PE2OqfJyl5OGTSE/jVF/+KQi GpLGmTYaDWMAevxDHbxADyTl8wQCSgEPt9X+ak1fwbHWDB8qZD1LKt3LSz+HYbZ7mCPO QpXKWS+nfdTWv9zzVfMhX0CWDTyEBbBVMwAByTf0ZxoGZ6l+kYxpDJEg0EZYtx7xsN2b j+FJV9UCVQ8KPD8ezGBPFnOiJISGAq9RVWg21YA3HhkLrO9uNvQxJCwB/rXBMx50Z9N9 4A0OsQAQ7TyYQeKeZpNAywD6fY124tkak8QSQcF0w6Ases6ECq9cNwl1ofA7JGmppE/G n8oQ== 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=6nODyHSCeXvoCgob8pb3aTn1fdszXyOayOP1bbhfjkU=; b=JMTj0++4y20x6nwo8CNlSV1/tLsfoNfz/I/f66Lg2yCmMkKi1cg6hhn9eg8FaF1HaJ nr1aJBGp1ZEf844haNLHQrgPEraOh2rMkohdTIJfNX2C7ZdQGVSdDh13nvLQgkhP8zKT /vDdPQ7BGSlpZEN7IkQ8CWwkaTgKFN1OCWwCijBQqoQcld9qt+kgT1zu/EwB9uO09XqJ ANzGVMqOC4BgAOz7oR4QmizxrR1cg8TJ4Gmwyop/Ceq4MsbEfYONP5HYMsOI+wmaNGaL Aaj+1qomoQYcd7t5tbX1kqh/dgSYBRZkheE7KQq248CrJQ71foMqdPdOzITpkTRXscje 2tAg== X-Gm-Message-State: AOAM532/uEFVoZQADPZZSlmEnP/XcZ5uj8jE8h3Y9N82dy8D6+ojajia Kl1czPZ5R33sjmVPMDOWzwZNZfgo2Vk= X-Received: by 2002:a63:8ac4:: with SMTP id y187mr13902328pgd.462.1638714410781; Sun, 05 Dec 2021 06:26:50 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x9sm10192265pjq.50.2021.12.05.06.26.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 06:26:50 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 22:26:36 +0800 Message-Id: <1638714396-23062-6-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 6/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: PuhEqaGWMwNK 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 a8d079e..6442e5b 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 AVERROR_EOF; 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 AVERROR_EOF; 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..4a413f0 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);