From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 6675B4E4DB for ; Tue, 10 Jun 2025 03:45:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id CD65F68CC3C; Tue, 10 Jun 2025 06:45:37 +0300 (EEST) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B8E7468C6B9 for ; Tue, 10 Jun 2025 06:45:31 +0300 (EEST) Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-879d2e419b9so4310506a12.2 for ; Mon, 09 Jun 2025 20:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749527130; x=1750131930; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ImbcIq5XjL8D8jrK6WWbV634zzOpCG3vez93bvJK/S4=; b=CWamB2+HiVztx6TK3SGNY/HeAKfeMDuzSkm+rwmYeuqIyc4U/+U6LOCrmc8+AKZloQ CwoqE2UPNRrVzsjCQ/G/ISCL+/y8k7onFx6DE8UGvXfTSfMCKBANbnBMpkkal6A3ciiy IQpqbhPqX+qHIYPWmzvZBgz5MUb9t+nsvf3T4k1Qr7fi42vQyy//Dk9+EokyV9U/L/hV 6TT0Eov3wztjxTo8fcKfbjl9PUiC1sCDxcs6D2gTn/8kEld4jv49/Xziyw0yQZA15hTA z2KgXBdH3R2GMOwxkdLmPo5hR5sj/vtbiFI6Kkg1Odx7JUMtKw3w6HSd2p1V/jlpUO2G 6HVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749527130; x=1750131930; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ImbcIq5XjL8D8jrK6WWbV634zzOpCG3vez93bvJK/S4=; b=d1Z1La5tnayHGB8xnEuVMsfpn/x95t88DaJqNGm8BEZJ0nA+csCuR7lb6F6SVP9icE gkHsDANAgIJQrPOJKESdCx/f3rXIwoWhk0UlhxL8ZW7nernHdxDegffhqTlAFRH0ZoGK egvA1DZ+hRY8oM52HZ0WRTktEfzvFOVUhLJH0DLP23S4tKIhf7eRMeS2E2LIFbTmYJ+q t2Cs6DVX4qUvg4R5d90s3PTA+TwOOBBLLT8+7mQTkvEKPJoAWG17bTTQ+NF5QU5Ub4aJ Won63ANsHq+91YeV44C0TRzAM/JSkKtqUVPxEqBwMNf3E72051Nwyl73kxg4Opuq9IJu Bjcg== X-Gm-Message-State: AOJu0YwOyZx2V5AUqxQO7LK9NiTUoH94a3CUFl6/E1sLN83ikorpZoQY /r+bcjJqjJwLNKuk1q7H/gOrZvfXS7YtQi8Dh6vTodhLmtbWCBBlO1bMNOah4QE8 X-Gm-Gg: ASbGncvHPH7AMGbyGy75EmJpYvzSS07a5EOBGI/zPjIWYTUJYRpe16EjXlX0B6OBdG+ +3io4A5olSy2Ek59BmC/Xi1Gf75UboUBh8V8PZS/Lxz7H9gkpgqUN7E4/wJnsCUI7RyD3xGAV5s uvVldBEOxTAWPZ+mtVIjcV4+oBOvM9u2LTNvFhaFURQWnoFnvfzS22epoXHkoH1AZQsMCjKtgg4 Jo2drh8EwAZscWPQiluUGCbKS2iuIKJW6cXsWr8xI10lYvdB02XeNzMMUMhY8pgDmupEvQnO1Pf 5gvbztW6SfP9eh1SonB96x8NpcV1uVIZdTNzBdBQP5O4UtUvNfJyKYcPoLq0NVEGMg/xdBpqxPU RCmN6zl0tfQ8= X-Google-Smtp-Source: AGHT+IG59JYedh9CIFkk7jX7koV0yqvjCbkJqRxJA/ePy01IDK7aSrQ8++6qP+9otJhIylerQMDWFQ== X-Received: by 2002:a05:6a21:511:b0:21a:e751:e048 with SMTP id adf61e73a8af0-21f78c71caamr2289434637.35.1749527129514; Mon, 09 Jun 2025 20:45:29 -0700 (PDT) Received: from homestead.aragog.com ([2605:a601:a9a2:a100:67c:16ff:fe02:37f0]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7482af7abf6sm6467182b3a.46.2025.06.09.20.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jun 2025 20:45:29 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Jun 2025 21:45:28 -0600 Message-ID: <20250610034528.30157-1-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/demux: Fix segfault due to avcodec_open2 failure (v2) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Pavel Koshevoy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes 'ffprobe 1_poc.mp4' segfault introduced with commit 0021484d05f9b0f032fa319399de6e24eea0c04f codec_close should not assume that the codec_id did not change. --- libavformat/demux.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index ecd4f40da9..3749ab67a3 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1292,9 +1292,15 @@ static int codec_close(FFStream *sti) { AVCodecContext *avctx_new = NULL; AVCodecParameters *par_tmp = NULL; + const AVCodec *new_codec = NULL; int ret; - avctx_new = avcodec_alloc_context3(sti->avctx->codec); + new_codec = + (sti->avctx->codec_id != sti->pub.codecpar->codec_id) ? + avcodec_find_decoder(sti->pub.codecpar->codec_id) : + sti->avctx->codec; + + avctx_new = avcodec_alloc_context3(new_codec); if (!avctx_new) { ret = AVERROR(ENOMEM); goto fail; -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".