From patchwork Wed Jan 1 05:20:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17106 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BC94644AD49 for ; Wed, 1 Jan 2020 07:21:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 995EF68AD9C; Wed, 1 Jan 2020 07:21:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01B8768AD6B for ; Wed, 1 Jan 2020 07:21:06 +0200 (EET) Received: by mail-pj1-f66.google.com with SMTP id t101so1879843pjb.4 for ; Tue, 31 Dec 2019 21:21:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4aG5j/W7JHpxn8FSFrQw3wdQgxTO6wNCG0+NVb9AfHY=; b=EYqiEaGdiRxZSJV9tMJSNtg+j9gy+IYBrNJeLp8XVbKYpUXcc6X91RtXeBB0tHF6X9 0d8FYTt7G9/JDMO0MFNpTFgHQeKN3x/grLTunPqskANfw9K6RFv8xZJMWO0yqPHDCaS1 dWjA3CqzpUWdrPjwsD9NgZs+6R6WJEaLWDYlCibJz8V4t+XMm6SSrDI/DRpHl8Y4pWKC d6vn2KyZxdB955x2+ksdYGXqXGeQ9Ri+TJG9vmx+PKJ2zpCwyj9WV65qm+chrwpBqZw2 1Fnt74Pz233ZmBeJyvo2fOhzbAVHHBae/ashuYePzpbd8G4T/ypjh1//WS9i6ajv8ALe vddA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4aG5j/W7JHpxn8FSFrQw3wdQgxTO6wNCG0+NVb9AfHY=; b=Q7XCJiHSP7Q/Xud3m3UMl+UjRe3HKeQFrvc/ukK+Hq+VxqeCLgf4rwvCw7hIX8dvhp ae+hfnI2XEt3a68kOrWCwfoL8Ay/LZsihDEE+gPKPCTjob7Fo8aQsZ11cpX8LfqBycok tZnDopCyCaEt5icJRffRvVPYZllBBOzFD0gQp4levcXTqUGeGaNlPLvYslRM26KR8heD BpsaKdimrsBoXxQK53wDdU3oWZc5gbnwL7n9qTxK0iqmJvL6AOOs7t4B2BwN/LJ55i2u 5pMSX+e9XbmsJ1lUneg+5oMMwWgaqLKoaNo3Vote+r1x8DZ+H42WiCHyG50PADASoM5m B1uA== X-Gm-Message-State: APjAAAVXhAp4IVlGVTjjVK+uvDxHfWqmAfB+IBs97jn8N1GYIBQuchpv IRUJ7o2zlK0dyE+8a3T4EfOCFtDE X-Google-Smtp-Source: APXvYqyj+WhJkafWTDdaD8gUzAwJCsojc0kO2D93WMVCHz2g2Ks3UNgT464VA+Kdi3EuJ6OFpMuj3A== X-Received: by 2002:a17:902:d217:: with SMTP id t23mr65871578ply.197.1577856065223; Tue, 31 Dec 2019 21:21:05 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id s15sm53908530pgq.4.2019.12.31.21.21.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 21:21:04 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 13:20:37 +0800 Message-Id: <1577856040-17409-9-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1577856040-17409-1-git-send-email-mypopydev@gmail.com> References: <1577856040-17409-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 09/12] lavf/dashenc: fix memory leak after av_dict_parse_string fail 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao In case of failure, all the successfully set entries are stored in *pm. We need to manually free the created dictionary to avoid memory leak. Signed-off-by: Jun Zhao --- libavformat/dashenc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 8c28fb6..c37678d 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1305,8 +1305,10 @@ static int dash_init(AVFormatContext *s) if (c->format_options_str) { ret = av_dict_parse_string(&opts, c->format_options_str, "=", ":", 0); - if (ret < 0) + if (ret < 0) { + av_dict_free(&opts); return ret; + } } if (os->segment_type == SEGMENT_TYPE_MP4) {