From patchwork Sun Dec 31 05:50:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 7044 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp12291360jad; Sat, 30 Dec 2017 21:50:37 -0800 (PST) X-Google-Smtp-Source: ACJfBoscFtwdkPyMozNGdgCNKYXku8SniAAIwcTORX7M1n6MbDTK7b2MVWVu9u5wAsjauQqVBULJ X-Received: by 10.28.8.4 with SMTP id 4mr13108465wmi.85.1514699437470; Sat, 30 Dec 2017 21:50:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514699437; cv=none; d=google.com; s=arc-20160816; b=wklxXHLoRLsqyQB/m60/wini8zT5mghfqt9zZ/K8OFjrxssWVlMJ50JPiZ50rorQ1B QFF8CGFjBgGbGiNkxv+8PTelvZsnkLc/DNUMy2kYtDTRIg7H2nYUQ6lykBng+nr5yKlf c6viDHqsJJu1lMv3bTJMCMDip0tUDuiUuB2QyHDwhX7Ge/OxlhE7buoUGP16cHRiTawk ZWf6cHVfG5RMroHQgXxs0z/7Vq92opBjLpB874trRCy5JUdTAuIpBG75Zqt4anX9HiPZ 34KsMz6UhIhGC07KWf5kQXrnn58DF5eaitplWMIRaKOYUdBQSUIutOMvcMhIcBNRPkPK 6Oiw== 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:arc-authentication-results; bh=WRVxNdVYe5rhrBMQj3b/a57vb8LTDsU8MMZcrHoT16M=; b=irRVfsi4XPvZVgSXiurs1yZvBxtVYcXRXISizv+dAGKdUOctyf8mrhYiS9pUaTeUWR AfH1YjjTFeoVmORSH+Q8SEsSO3K17IrAuTYdE50BwnrAbdRTskokSB6EOqJaPb7nDwvb PT4pb+gUH7oxXbmKt3H84n4DDtsqQGmx68ZzdrIO8Qs6Fq35nw8bhHsI8H5EPJVanI2X 7+Sm1PwHmEngL+NsPoB9VeRPtU/FvCJ6PhIIgktnennkXcYgrVDJ4EqxGPudc6M/6vJW z+aAMnPhxlQO+flX0Lx9wCognAgyn729icEx+d9gyWM8YJmrssbKZ+ztAvUbL+Bl7xey BdNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=dwfIGxsa; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q9si15033804wrd.327.2017.12.30.21.50.36; Sat, 30 Dec 2017 21:50:37 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=dwfIGxsa; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 38E57689820; Sun, 31 Dec 2017 07:50:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CA8B6882F6 for ; Sun, 31 Dec 2017 07:50:14 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id p84so23614943pfd.3 for ; Sat, 30 Dec 2017 21:50:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=N/Ec9QpXvv59HOfwIRO8u6Av2X1ienDaqRszGcvqdjQ=; b=dwfIGxsacZ04j4R2r2SIPtB310qvjSqREESAkUCs3kyolXv7NncDyYcJXg8YrBQRlH 8YReNziHhT7oR8ovzGbwLRAfBlJImkbAVksiKhg6jRgcplkj2pBazW6gvwdcFHzF7RPD EATifLSg1N2PG+IaFVc2mVhSjlGRlZTesS1rvYOEASIuDpRH8LyWtwhAeAyXrdakxciE yxrdemwblWW1kFL/TIInbAoDJVF9kzsaAiMOBzyc9VaQE+zRhUUPxms6IZTu6LUAGoUw rEBDwmrJAK2fuop47eHdxNsJjze2gl9eoXmIFxk9BZwHLDAqQtKlPv6s9S9yazGL3c2f PyYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=N/Ec9QpXvv59HOfwIRO8u6Av2X1ienDaqRszGcvqdjQ=; b=iehqxB7KpM2bipZTaist8A4ctpOpiClR+CehTPstgYIAMykg/b8ADKPkrRms6hssYN 21+gqzyZB5onSuBr10rzLgGFeUJGEdsseSnPdZT2R4MgdahNgOqieoAsYGFbr/j/YkbV QxvDEoK4Nl3Vc+rRRktlk2/b4tcUTri4V7AQQ7LrYqDNUMJZGT+6sXjCvcrNIbAgxM6f N/9isyGqO10RxhbF1zGQ19ocJMSCBFlaRZCIeIg7Gtxg6iE0XkflnSyt00rMSXAOxtoz HCPpOXzcwX/1Q6wq6ATTDU5zXDDC5frrA6tRKbrSvqZfAj7eYKdIk+oCoLsiUuDDJ3FQ aBUQ== X-Gm-Message-State: AKGB3mJOMabxa7gdnAkZqOsP0lLxWxu8vBccnB+C+zL/DhWijCfYUH9q Rl+sWy2tK65BMaKz0FjMvMz1OmAk X-Received: by 10.99.121.79 with SMTP id u76mr1789408pgc.337.1514699427495; Sat, 30 Dec 2017 21:50:27 -0800 (PST) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id s5sm35825375pgp.91.2017.12.30.21.50.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 30 Dec 2017 21:50:26 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Dec 2017 21:50:17 -0800 Message-Id: <20171231055017.49285-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH v2] avformat/hls: release mem resource to fix memleak 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 Cc: lq@chinaffmpeg.org, Aman Gupta , derek.buitenhuis@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Steven Liu fix CID: 1426991 Signed-off-by: Steven Liu Signed-off-by: Aman Gupta --- libavformat/hls.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index d9f7c6de4d..950cc4c3bd 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1473,8 +1473,11 @@ reload: if (c->http_multiple == -1) { uint8_t *http_version_opt = NULL; - av_opt_get(v->input, "http_version", AV_OPT_SEARCH_CHILDREN, &http_version_opt); - c->http_multiple = http_version_opt && strncmp((const char *)http_version_opt, "1.1", 3) == 0; + int r = av_opt_get(v->input, "http_version", AV_OPT_SEARCH_CHILDREN, &http_version_opt); + if (r >= 0) { + c->http_multiple = strncmp((const char *)http_version_opt, "1.1", 3) == 0; + av_freep(&http_version_opt); + } } seg = next_segment(v);