From patchwork Wed Jan 24 00:49:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Allmann X-Patchwork-Id: 7402 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp132660jak; Tue, 23 Jan 2018 16:55:47 -0800 (PST) X-Google-Smtp-Source: AH8x227HUCSWpqfg9UGznl+pFDKEKOa/P8JhBj3QE23lFG0wuzeLC/XUAeHWui43nSpb/h5EStcC X-Received: by 10.28.165.4 with SMTP id o4mr3195486wme.66.1516755347195; Tue, 23 Jan 2018 16:55:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516755347; cv=none; d=google.com; s=arc-20160816; b=CaMK1Urj/1AM5wjRnb9Z3/fvu2OiIFsLr5i2EKRtVETT8vdz+bieIk5VnCFpUm4Vbo wY7fY5vICvegc2alGkUGulHqo+0Tnpu7MorBHrFEkbKsEIcS59xe/bOgA0kPDZyXnLHd ntO+EMUfMOjuWGrIpaeAqn7zHqx3/ndhONalJx4mH69AtjVaszmNkTsOruKDu6lCY3yh 0CinvcGJBegd01bWY8DvOrqO9v9hXESjcQSTYZr1stgdiW6E/q1jKbkToRHIzE/4daZE X/r36aoaBtVAA6wJtKe1kio5lC6z1V4IqRNqDriDaiVVnOK4gAPOaK3Iwz0xqyujTpfS bFBQ== 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: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:arc-authentication-results; bh=pk+sBeuPMKeRpUVqUfKTHrp0z/MfxwvwLJ7PaWM7oPc=; b=c/R8ns8i+qlc/boL9KK20mwYWLTuuto7MNRCbNTsScEUY4QajdBsT/fnh+8diZQDlp n3Sq8wgI+rryuAjpWb02cKcRPWm8aqT9QVrEe2Q3XwCNbnFdXjJQgsOrE2n0Ez2yx7Yx F7duK6lxyY5HyWwjufx5BUjjNh9r/c7UPG97eSRkCP4++YxJD/gbNKsZzkfwv5e6xNyx LdsdwGe/YRwlkdoM457ww23tDg6VE8ys2H8vsb5EgqutQg7QlEIA1+6VZo4Kc0tC1CRq dBFW2OUBAszaC3Si6TlcuZJofjvFYmWG9BjBEFUTZOrFqeLlwU6YmncC6jGhmnBVLF3R RMjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BGkI5Z0p; 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=NONE 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 q184si57675wmb.192.2018.01.23.16.55.46; Tue, 23 Jan 2018 16:55: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=20161025 header.b=BGkI5Z0p; 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=NONE 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 86972689D39; Wed, 24 Jan 2018 02:55:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49D43689AA1 for ; Wed, 24 Jan 2018 02:55:35 +0200 (EET) Received: by mail-pf0-f180.google.com with SMTP id p1so1712967pfh.4 for ; Tue, 23 Jan 2018 16:55:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=bbE1gnFu1260KLHcyHHmVJHDCnnrW+9DlmRIZqOKFVI=; b=BGkI5Z0pA6tWQ5td1AvU+678W6ScJ9ww5Er0FehhqinsvFPNS1UDNcrg+utHm3E4pH Q9QW8tjjnfwU5u5YOpV715TCtZw6iq8+R5uufBtriShLfmzoDe5sgmHnAu/y8togS26J 6kOwmRAQMmcKKjkODeSueNxKe3qAI28bdvaHh7p16nJ4OIy9HPNsn3CWX4iC0zgX9nLs F7Wzu7yZIR2nEw5KMziGLAUbmdY6auMQaptBfdbbV4Udz/34F+Y/pwfENPh0vhkgnuS0 d9ETdLambHuvZ0mPKWgB00Fho2d6pKZfiymf/cC9hnkb3hKkb1mGFk4vHwrsAORbUsHA Uu0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=bbE1gnFu1260KLHcyHHmVJHDCnnrW+9DlmRIZqOKFVI=; b=WDzFSpevSVkZ94fj9nLjcRsV9yXoh6wowafPucTlP1g2vN3kKPvKYIefZre8VddvgV osPjlNKKV0KhqbAfUW7f+Rgs5rpbCZGh3Nh3thbeJdLJkd4XGOnUuS+R6JxhQdCMLrQ2 /ufx0gH9TLHm7Tc5M7eUiGB9zgHTvIyKS1NICba0HHODFAEIxmC/xRMacpFREXdsybFE xq1XEk5xVayiQGqFLjCzc0qWrlAB188GFY2YkAZ5R7x6ryYYHkjS07UpLdHsh2uyYOOE ZpHZCLfnL3qTBeN7o0WisAF0BXSzX0O6GuTcDB9A5OwboCWUK16pnnAdJrKs4m9seHKC MmGg== X-Gm-Message-State: AKwxytchHpH98ShvSoq8RDyOB5NSMVkjjn1CFPvOhmkZ4xyZuK9Bgo30 jlYVZDM1VrMI0QjY2aECR6bEpOVv X-Received: by 2002:a17:902:bcc5:: with SMTP id o5-v6mr6671754pls.67.1516754963370; Tue, 23 Jan 2018 16:49:23 -0800 (PST) Received: from localhost.localdomain (cpe-76-172-80-40.socal.res.rr.com. [76.172.80.40]) by smtp.gmail.com with ESMTPSA id z15sm36034311pgr.62.2018.01.23.16.49.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jan 2018 16:49:22 -0800 (PST) From: Josh Allmann To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Jan 2018 16:49:16 -0800 Message-Id: <1516754956-23680-1-git-send-email-joshua.allmann@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] rtmp: Plug leak if sending bytes read report fails. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/rtmpproto.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index faf2a6f244..b741e421af 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2431,8 +2431,10 @@ static int get_packet(URLContext *s, int for_header) rt->bytes_read += ret; if (rt->bytes_read - rt->last_bytes_read > rt->receive_report_size) { av_log(s, AV_LOG_DEBUG, "Sending bytes read report\n"); - if ((ret = gen_bytes_read(s, rt, rpkt.timestamp + 1)) < 0) + if ((ret = gen_bytes_read(s, rt, rpkt.timestamp + 1)) < 0) { + ff_rtmp_packet_destroy(&rpkt); return ret; + } rt->last_bytes_read = rt->bytes_read; }