From patchwork Sat Oct 19 15:03:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 15847 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 C1F24448C21 for ; Sat, 19 Oct 2019 18:04:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A080168ACA1; Sat, 19 Oct 2019 18:04:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 574D068AC82 for ; Sat, 19 Oct 2019 18:03:56 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id 4so8155671qki.6 for ; Sat, 19 Oct 2019 08:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Q8sQ/cSXODOJ6L5sqAGhXS9Q6REu1c1koVfUNC98g0c=; b=MHdp3COk1Wdz7tM7DlGnaaDWhiwr5ovFUd03PT02JVUgCfs2wZlIn0zYRNCK0XAUDZ stE7/E21I0S9lAHdUpl9HfoZ70ePxBNENzog8QlMOdpyFcgW8cp98Dz10mQnnyx+DtgP L1h/tfiTIHEonehoJJMz741g4Fik6UmxxyaSph0GrLf2TrA+yP604sg1GQZMG+tFy0Xp 5iH9NNrnPnZEHGvzHuJwy4LrNMMXwvCElBTKag0OBN3hIvoJCFwt+4vnviX1vzVSD/4o 4vi32Tm4DPKItBDlT4pAbskwnEbUKBHL4q7JqQwb+COdTkTKcIT9OwPYXrgb+1g6lQCi b9oQ== 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:mime-version :content-transfer-encoding; bh=Q8sQ/cSXODOJ6L5sqAGhXS9Q6REu1c1koVfUNC98g0c=; b=gTFefoEf9OiU5nFXsaF7EXwHokmEuxR73SiIrPQvy47kn9/v5V9AodOf5AKRedm2pK R/OG+O3e1Mv7vy+gP5+DYrjb00SFjygoDMHnK5XbR2LIT4TgzrFMpDZf5mkemUXhUPP1 56W0HqJUInUtT+LuX58VnlYzjQKr7aSyBYzBO9GeXpSRRFC9kxVTzbPcR58DOAGJxKMC DMyddva/uTW/BovVMmwtovjxd4f2vdPFefYrVRkLGpotp2QQt4V2Ni6pP/ghIa26MxmO 4tiz506CnStlaBO8RXSPswnqFW/eV8Jf6Mz9bygByNIw9FQ6HlF/OQO0cTKgJKgBkSTu BINw== X-Gm-Message-State: APjAAAWjnqMfeB+OBl142/JC6P1/M+nM5jMQxXqlt4BJjLXtT+btoxzw BWZQUsCjB310akKjrsL0eS1WiK56 X-Google-Smtp-Source: APXvYqylS1wpUUjmVrNXLHnIdmF1fTqArpfztqhvkaoF2hntboY5rClT1or1yJ3Cm4gnIfciVSU0xQ== X-Received: by 2002:a37:db0a:: with SMTP id e10mr14093702qki.3.1571497434732; Sat, 19 Oct 2019 08:03:54 -0700 (PDT) Received: from localhost.localdomain ([191.83.221.234]) by smtp.gmail.com with ESMTPSA id 56sm9797339qty.15.2019.10.19.08.03.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:03:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Oct 2019 12:03:42 -0300 Message-Id: <20191019150342.1490-1-jamrial@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/options: don't call avformat_free_context() within avformat_alloc_context() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" avformat_free_context() expects AVFormatContext->internal to not be NULL. Signed-off-by: James Almer --- Alternatively we could check for internal != NULL in avformat_free_context() before dereferencing it, but i don't think it makes sense calling that function at all if the AVFormatContext wasn't even fully allocated to begin with. libavformat/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/options.c b/libavformat/options.c index c188c23506..9a6deed0df 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -150,7 +150,7 @@ AVFormatContext *avformat_alloc_context(void) ic->internal = av_mallocz(sizeof(*ic->internal)); if (!ic->internal) { - avformat_free_context(ic); + av_free(ic); return NULL; } ic->internal->offset = AV_NOPTS_VALUE;