From patchwork Sat May 11 07:23:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13068 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 EBCB54477D1 for ; Sat, 11 May 2019 10:29:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAA9F680924; Sat, 11 May 2019 10:29:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A751B680924 for ; Sat, 11 May 2019 10:29:40 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id b3so3869882plr.7 for ; Sat, 11 May 2019 00:29:40 -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:in-reply-to:references; bh=UZM6HGFqkJiRzBboxXcJz/E+IjrJ3x6lpYsbNEHoNwA=; b=YZPEnrJXvvfc3/gwFu7QbfIEI43S4kYeEcOR5+ISDC2ORZwCXNSqsREhy6saYxMM9Q cMml9nYgQKtW9/WUqo1g0T06ULT+AP4eBUj7ldM4TyUL85fWgBC6PqMcOiNL2tJMTMUX bduYrvIS1hcVGfHx9bP1h9KKJWV2L0mBFKS39Oa89jbpRIItNG6J3Td0thdlX/DaPmwS eTEDIf7sxBgzFcEB2e1RGuRm4Cb/zGQKyJuRzcPZ+1E6e5H9jw3NnG7jFczb/215M7CE s2tj1IThFpeMEtWCqapaKokpCj6XttRBvTVv0tAFpr4i/uBcIXKcdXbmX0ZoM9txtOW3 c1aQ== 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=UZM6HGFqkJiRzBboxXcJz/E+IjrJ3x6lpYsbNEHoNwA=; b=orNu1LubjCwNqhKoojUHURjwOv+clgoWt4pK9fUs3/UWLDIEfsxWghjL53XzxcP8jf ttZMot4CF3ioh8X0+tbn7mlYkD9lAldlUcB5NsNp/SrjpqaWfvkq3q3LvtMTUqNXUvOy qbOfbDUKFQ3JbvC9rTyP47jSmGqi7tWH8hAo1I48Q07+VcMKMWtshVbLfl5iCTOGTMtZ kapVcebOl/Tllg5GnH0t3qaFJhuQNnupYDJ9d7CQI0vBEAnzVrOMNwiyFjv6UfjQgTyy 9GT5GpB5lOD4x8VXzp6bmDjB6XyZ8RNqafiEt2QEV6pTKn5a8/M/r3o3EOKQwsf/Fvh3 UA2A== X-Gm-Message-State: APjAAAUJhU4xKe7MfrJUlWkQ+MFPrnKxMB2hOOlvqJyg7+YWI96rSep6 +EQ3oYILUVQAAmUZiZTzoRiV4OsG X-Google-Smtp-Source: APXvYqxM8p2S25HgNaiguH/niDu9ResMUToCl+itMBMjeovW93VsfF5riG3jLRPnHCjf8eaRiXWIGw== X-Received: by 2002:a17:902:7406:: with SMTP id g6mr17644108pll.328.1557559432807; Sat, 11 May 2019 00:23:52 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id x4sm9196220pfm.19.2019.05.11.00.23.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 May 2019 00:23:52 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2019 15:23:44 +0800 Message-Id: <1557559424-5566-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1557559424-5566-1-git-send-email-mypopydev@gmail.com> References: <1557559424-5566-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavf/dashdec: refactoring error handle logic for open_input 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 refactoring error handle logic for open_input. Signed-off-by: Jun Zhao --- libavformat/dashdec.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index ce8bd4a..2c50f23 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1687,6 +1687,7 @@ static int open_input(DASHContext *c, struct representation *pls, struct fragmen url = av_mallocz(c->max_url_size); if (!url) { + ret = AVERROR(ENOMEM); goto cleanup; } @@ -1701,9 +1702,6 @@ static int open_input(DASHContext *c, struct representation *pls, struct fragmen av_log(pls->parent, AV_LOG_VERBOSE, "DASH request for url '%s', offset %"PRId64", playlist %d\n", url, seg->url_offset, pls->rep_idx); ret = open_url(pls->parent, &pls->input, url, c->avio_opts, opts, NULL); - if (ret < 0) { - goto cleanup; - } cleanup: av_free(url);