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 F2C014E96F for ; Mon, 9 Feb 2026 02:34:17 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'gFTJkpdEoafAwHVDAWL14EyV40OYc2hPvQeXukINwWc=', expected b'Y9YsOHC2an1tv/MzWtJ/2pePv/y3PGbCUjF61oUsfKU=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1770604446; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=gFTJkpdEoafAwHVDAWL14EyV40OYc2hPvQeXukINwWc=; b=0nrS/KOYsHHNqXQMhwrAG3SaKrJclUT9pOiYHxFNVywAZZjlJzqzwnqQwxPtJrL/j7z4i y8jwQ0nFpV6pq9dpLEZXctjm/zAR4qHLr4dHMX/Jty/Jyg1MGrJL0LSgtKHU2O2s6+n3jx9 GPbE5YrQrHjAVFPlM2T5ELfmaGhvX4KWDRJoOGBvfvEY5Hl+bPY+eIGzuv1yeW+jxebGZJN 4DmQ6W6+qP4/y25PP+NqaglntraE0jlTC3J7KgNM4vCQzM19DktrfmK6WPL2XJ7iLCG6DbB hR0EGP1PTw07mDcVnQsieKDqhhu9Zx3uJCOuvF0m9Ul8wMnEoVz6Kqj+DQlw== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 499816910E0; Mon, 9 Feb 2026 04:34:06 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1770604429; b=iIBKIiye2YbUIVqCERoIzfU2voHMZKNyvmCaRf1C5hEu/TUZCWVmICyhsoFjIPhZvkyY6 mGXu5JVsfkr608Exg3F4Ya8OuiLdd/G9pr6qsHTaAQ/RgyEG5/gnioM/nsi5fotwStpwVwv /oO27Zbo9LpkX71w81wwCO6kxvsL+epVT2BusE7j31DxLm/PM5TpANwtcYDsTV4/p8xiyrJ QnmMjyKJX4mg6pW2IQNE0FG8GMzdio4w7XelEqaAsvVBvth8R5NTd5CQSuESnX4ajdTbF/j c41s+oA6Zlychl8hF4LUzQjkb8Q9Jsuusc5GFsvBW+w1dmauMiqJ2fP8tNMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1770604429; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=CDMqfNWvBwAguEjcKgNzMZ/aImLZ/904satjHLY4KkI=; b=HIfzn05kqw0rZuUCxQ1GWN529cxg/nPpMF0oP025iLoNanK01yzSOL25kxRltQY40V//v UyC2FPw/biUNfTP/y+/KifBmHw2+0dxuohgyZ3Csf54SqSKphEDyydJtYm/kgVrPJxNw9TE P1fQ3jXtU19oaICsXV1OL+RxcmgNf6bnkCSrSRwXtkrj84ULh5Arnd6jC6fQCofEgEJD4J4 UucANSEPKKgPf8leiZmqZn7jacr10KhdcHesUqwoGhBgVg1FECFHkkNpWzUOaSxlt3bUwSz wTZm9crvGclefMKdavqcAjG/7UZ+nTYBQ57GDjHxUzORpYRt8RZcFK2hq5RA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1770604418; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=Y9YsOHC2an1tv/MzWtJ/2pePv/y3PGbCUjF61oUsfKU=; b=u48SdTEncxs5qxXGNJq27hjtkyjV6bpIeaPKNtzb8sNCboG9aK+wcxPSoe6pusl/W6gy8 dNCj2NpKBGkNvL0GuLdrf3z9a4l0OmJaPwOPTPqBY3Is5k8Nw7fw0g60pvvU+82Z7Mk5R6j 9SLYqBCwK02nyHEL5R4p5jfx8+hqpmgq7UgG9QweloIVGeV/cUhklSGreLsBSim+CXkT8Zm 25cE/BVEx3dBNoq5vogoPSoT2GDleFM5m35Q3A++r/4ER7fwz0nvK758DQ/Ob3GjFsAajwu kXUyIoMby8NQINqhDnBp1yUiNC0FMznSODfnWI3xh6FeAQMSgxti0tKZckmQ== Received: from c8d966988b92 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C9EB1690DE6 for ; Mon, 9 Feb 2026 04:33:38 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 09 Feb 2026 02:33:38 -0000 Message-ID: <177060441899.25.5017934969013309557@4457048688e7> Message-ID-Hash: 2EMDAWSYDKCWNGF4LT72TMJIYXTF3MMR X-Message-ID-Hash: 2EMDAWSYDKCWNGF4LT72TMJIYXTF3MMR X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] avformat/mov: check for duplicate stsd before changing state (PR #21691) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: michaelni via ffmpeg-devel Cc: michaelni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21691 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21691 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21691.patch Signed-off-by: Michael Niedermayer >>From 192f9e5061d8c1d7cf9ce7ffc4b48e46c3cc51f0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 9 Feb 2026 03:07:21 +0100 Subject: [PATCH] avformat/mov: check for duplicate stsd before changing state Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index d19b213ffa..e0f984ccad 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3209,6 +3209,12 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) st = c->fc->streams[c->fc->nb_streams - 1]; sc = st->priv_data; + if (sc->extradata) { + av_log(c->fc, AV_LOG_ERROR, + "Duplicate stsd found in this track.\n"); + return AVERROR_INVALIDDATA; + } + sc->stsd_version = avio_r8(pb); avio_rb24(pb); /* flags */ entries = avio_rb32(pb); @@ -3219,12 +3225,6 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR_INVALIDDATA; } - if (sc->extradata) { - av_log(c->fc, AV_LOG_ERROR, - "Duplicate stsd found in this track.\n"); - return AVERROR_INVALIDDATA; - } - /* Prepare space for hosting multiple extradata. */ sc->extradata = av_calloc(entries, sizeof(*sc->extradata)); if (!sc->extradata) -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org