From patchwork Fri Aug 14 20:35:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21671 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 07223449905 for ; Fri, 14 Aug 2020 23:35:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D54FA68B5FC; Fri, 14 Aug 2020 23:35:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FA8768A8C7 for ; Fri, 14 Aug 2020 23:35:31 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id o23so11265154ejr.1 for ; Fri, 14 Aug 2020 13:35:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2vbWcoPsbW2G/U3fZeIEQv5GY9EVOWanYtek+gRFUf8=; b=BQcJqj+53YuPwkP/MWT/73nQqMjXaUyIilEtCFPIvMo/3tUNfutiZo9Y9Y9k49OTI7 IfhnWd6HBP+0MEtPSVN2AarMnZXkuNe+5JsPf5ZOOvcfPbdCFNjplRrXtiJJaMp6iz6/ O3gVdeijW1fwVRgvFSTrwcqOi/FY3aanLHwNJc4eMeoLFVStxj32cknrz9GC6ve6NmlL 3SX6Q/sWeMqjXj05Ml2gLE895dwUTTrJsmApLzpMRA8Qc/kSV2AuKZ7RlGNHdupOzHiR AIXD0KrLztXnsXTMN2+g03ZZJdsmDHJHtnAaI5UcL2nPsr6UJvvvItwCjJS5a4kkDuQn QK3Q== 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:mime-version :content-transfer-encoding; bh=2vbWcoPsbW2G/U3fZeIEQv5GY9EVOWanYtek+gRFUf8=; b=tl085b0IWqlQrQ+q61IMfzfFhOVulHOWjao6FsM2wylYf4DXBnoptntfTE0udzL42v NyNoAPkoK+efSwV0HaQhME33mcx4b9k0tqhOUiAZ5wMXwyV+UUJDQbDL+aT60lya0y3s 1/P6KGAbC+JBdC5LUNboJAY31fUDALj2WnbGRrWGyrEa+9hQ9wBW8OJps4SDyggB8uwu AzUi9FEdrPDiyu6+bgeFs9uQyLnqPiuoaIWDWl79sfRlf0GxYUUIEvfNd9njmn071oeD 6AUeVkMxtZMIjFwixt3ZyrBAg4GOfPG4V9JyuMi764wYzJuZWRwXXBQ8bEnmXSCvpTr3 gDNg== X-Gm-Message-State: AOAM530b0VyCphom4dVkMeV17lfC/Ra/3ija+E0Qgfd3fqbultBtSXpp TUMzPHs4A0+4guaHrAoSRfGfq+feTM8= X-Google-Smtp-Source: ABdhPJwNHr0koQq9Z4PARKU+HHbmpsSCzHNL/q/Jj4KOwC9BU8FKeDpnC9c8dCYw8yl8OB0YlS/yiw== X-Received: by 2002:a17:906:9592:: with SMTP id r18mr3984766ejx.464.1597437330329; Fri, 14 Aug 2020 13:35:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id dr21sm7959656ejc.112.2020.08.14.13.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 13:35:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Aug 2020 22:35:21 +0200 Message-Id: <20200814203521.29103-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hls: Fix memleak when url is empty 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes Coverity ID 1465888. Signed-off-by: Andreas Rheinhardt --- Why does this code actually not check the return value of ff_make_absolute_url()? libavformat/hls.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 84f0a5f323..4a3e0d6842 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -311,8 +311,10 @@ static struct playlist *new_playlist(HLSContext *c, const char *url, return NULL; reset_packet(&pls->pkt); ff_make_absolute_url(pls->url, sizeof(pls->url), base, url); - if (!pls->url[0]) + if (!pls->url[0]) { + av_free(pls); return NULL; + } pls->seek_timestamp = AV_NOPTS_VALUE; pls->is_id3_timestamped = -1;