From patchwork Sat Oct 17 18:22:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23039 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 6C9F444B29E for ; Sat, 17 Oct 2020 21:23:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F5C968B9AB; Sat, 17 Oct 2020 21:23:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1ED1468B63A for ; Sat, 17 Oct 2020 21:22:57 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id z22so3233711wmi.0 for ; Sat, 17 Oct 2020 11:22:57 -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:mime-version :content-transfer-encoding; bh=Y2VLxe2UP7StkgF0px4I2bA6RdyALevkd9roCrwUuYk=; b=eXidy3E3dRWh5msbCQeLX1twHcZSaQIqVaLtRVyZPct8cZicrCflBS2aIObfkP+X4q cho5T6rroV7NYxbnMw66fZJ656p7xoSN2Tr5ila0mZJiyan3pc1yQAHX7cKRJ/5nht7F yK1WlsQ9p0PB/vWo9yYK2+dXahg/1vDIt2hlBqfPjBPyfzCPWkRmwM9l5g03sFQF9hNs SE5Yh+Cw5MlM0kXcvsK82rYsAvBr8VtqnlmEVSD3pVB7VbyjTjkFMSMci1OVqT+Oj7L2 mCAW2BtA889Jan6QfplyZJiKLCdO/n77wlKirVqHBVBuPmqPARnCpyDi31dmJlgql3Ek R1PA== 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:mime-version :content-transfer-encoding; bh=Y2VLxe2UP7StkgF0px4I2bA6RdyALevkd9roCrwUuYk=; b=WsIHF3VPsn1wx8ehpuIpkKSuLaBxqBQE+hPiCR3FHDMptInSnTNHfBIKD1Yv3V6EDw 4VRZBZV7YnhvMMrFk+GXY43qhzjWV4I/0OGRznQE3G+XyUjio2DpgNi6KscQZbG50Bk2 w1nLmV359dLXfTfaI5D5uWJQhDjNxTpvOjfnd9LwU7+OeU/y2p+Tg43Jp9pPT+i5UBxz vL76WOTBG4PmRv/Ad3XgrjgqoIw4hhXw+5nycqKOylM/AQrQuwY4ZSZQIT2cgTIHapFj iRcvPKldY5Y2739dScjOAUGgF8/BxTHm5qAu2QzCd2ZIkAcfuUmIVXihgd7oAgQimWmH 1BCA== X-Gm-Message-State: AOAM532cvrFUpJlCS1qSNEve33O47lwOlrMDfCh/I9ATPfsFtIqNQc8F z1EkwpvW9xslkMhgxWI77EFH620QJhE= X-Google-Smtp-Source: ABdhPJxETo+XpSCS9kqLJdlsYUrf+wVvk6JT0mSh3aFMsUrFpt7Fxi6I2Ic+kf6MYLHAQeCS7VvOow== X-Received: by 2002:a1c:3:: with SMTP id 3mr9340014wma.14.1602958976250; Sat, 17 Oct 2020 11:22:56 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d20sm10440688wra.38.2020.10.17.11.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 11:22:55 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Oct 2020 20:22:38 +0200 Message-Id: <20201017182248.577108-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/11] avcodec/movtextdec: Reset counter of fonts when freeing them 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" If allocating fonts fails when reading the header, all fonts are freed, yet the counter of fonts is not reset and no error is returned; when subtitles are decoded lateron, the inexistent list of fonts is searched for the matching font for this particular entry which of course leads to a segfault. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 4a21dbf36d..068bdb7802 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -148,6 +148,7 @@ static void mov_text_cleanup_ftab(MovTextContext *m) } } av_freep(&m->ftab); + m->ftab_entries = 0; } static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) @@ -230,7 +231,6 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) box_size += 3; if (avctx->extradata_size < box_size) { mov_text_cleanup_ftab(m); - m->ftab_entries = 0; return -1; } m->ftab_temp = av_mallocz(sizeof(*m->ftab_temp)); @@ -245,7 +245,6 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) box_size = box_size + font_length; if (avctx->extradata_size < box_size) { mov_text_cleanup_ftab(m); - m->ftab_entries = 0; return -1; } m->ftab_temp->font = av_malloc(font_length + 1);