From patchwork Sat Oct 17 07:37:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23030 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 75AAB44A23D for ; Sat, 17 Oct 2020 10:38:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5686A68B61C; Sat, 17 Oct 2020 10:38:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 653CF68B61C for ; Sat, 17 Oct 2020 10:38:22 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id n15so5940906wrq.2 for ; Sat, 17 Oct 2020 00:38:22 -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 :mime-version:content-transfer-encoding; bh=QgRZgxdAU0ydGrx1r/w/XSVAzW6kkilvG63wT3DZV0Q=; b=bfYjayFUCH7A8VdVN0vpvOV3YH+FSEkjI4uXFFj0MYoA43UK4Klw8WJZUMdFu4dDXD DaoSvBgfIfAHXBkSxzKSlnGNcEGZnKutD08p2GAf+UL2Bc2beMNnOQBTZEM4uw8dIaLw kV5SCVwWEvqnBOCsB8EA2PmuC3LQHNUAD/aJWJ+hC4KhkrDQ6s32rOhWJnA+9IYbhb+w bVfGqayxRKhFjYGZ9SjyVgBEuDM7eu31aGEMbuVdJyafyFP4JnuGYMOfXAm8SnIb+7+m yEbkIU0n66WYadnHMyjTSGHiH06DF09xYrLdI3MbJhtKdF+DUHUfOPb82zm/egVAJDbG eoqg== 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:mime-version:content-transfer-encoding; bh=QgRZgxdAU0ydGrx1r/w/XSVAzW6kkilvG63wT3DZV0Q=; b=ecNS/Vhvz0TC1W3VtvZFpoLPquPWdkX6LDDH7dHMYKC5QR0wI9NM+4+h2vwegge1fT fRDY3riCJRcFi5foqAJTxF32eiHCGLpmai8UHjvL3xcSlg/CVOGfzROpt8Q5hFP5a/XE O9eNMTbOFFrCrN3dkSCPfEm8rJjzgxVdjDisMEE+Q7x3kybThwgCyN6aZYx0W5MV+yTc uKvFA0Tua4GUXmFpjdvuKrvd/UEk6XIf3YWbgjABEwLkCY5pBrAPrgSlWCFlSsPYXI+x v9JDe4G9FQCXQ4px/OrePfN6e99lHbW37+8paCHRmRue+vKzSFcwZEmPpDbIvHFss6Ux NjWQ== X-Gm-Message-State: AOAM531QWX4InGCsqW9XoB9F5GTLg93SZIMRGfF9b7BgxsxqYrZCQVNt m3ISy9Yix2nKGFmA4KuOcGA6/MjzFr4= X-Google-Smtp-Source: ABdhPJxqJR8t6NoX+jIarh802gd1oxDeOnG++agHQSgQrYGblGkuByZPltDzEiinnvsrR5aJXR8jFQ== X-Received: by 2002:a5d:4141:: with SMTP id c1mr8590033wrq.113.1602920301579; Sat, 17 Oct 2020 00:38:21 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id 24sm5946553wmg.8.2020.10.17.00.38.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 00:38:20 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Oct 2020 09:37:39 +0200 Message-Id: <20201017073745.403153-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201017073745.403153-1-andreas.rheinhardt@gmail.com> References: <20201017073745.403153-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/8] avcodec/movtextenc: Reset array counter after freeing array 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" Otherwise the mov_text encoder can segfault when given subtitles with more than one AVSubtitleRect if one of the first nb_rects - 1 rects contained a style attribute. Signed-off-by: Andreas Rheinhardt --- The earlier commit message claimed to be about a muxer in avcodec/movtextdec. I still don't know whether the STYL_BOX flag should be reset or not. libavcodec/movtextenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 11db240ab7..81e8c2e802 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -102,6 +102,7 @@ static void mov_text_cleanup(MovTextContext *s) av_freep(&s->style_attributes[j]); } av_freep(&s->style_attributes); + s->count = 0; } if (s->style_attributes_temp) { *s->style_attributes_temp = s->d;