From patchwork Sat Oct 17 07:37:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23031 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 0EB4544A23D for ; Sat, 17 Oct 2020 10:38:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D831A68B971; Sat, 17 Oct 2020 10:38:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78C2568B61C for ; Sat, 17 Oct 2020 10:38:23 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id y12so5919358wrp.6 for ; Sat, 17 Oct 2020 00:38:23 -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=wM7dPk/HXc1x1Fqgdd5LmhzPTPKB+/nZoreC/6x2STw=; b=aQsqTXRrCNi5GdmperNz7EgBQWqw1nANWLYzFHLYr38C7a1uM9Rsrahyw+37nxiZlX 7QitkUquexo1KsEaYCC8Cd0HGhG4BlD9Z1rL/zYk42I0zdoS/Agcf3k/sgVI/eL2IjAE NX725xiNabvrmv0buoBUVQ//nD7zTUAVoYe/wl95rY4s5oM1r0eclxJ8hn7vpzXZGxZ5 88jhsbsRuhTUhzxsI9dlwsMt1mz1OiKXooHRW3NL7VgSNiLK2hdxGT3P9/1BkeAz56LI uh7+egOu7es2WbvsHXPcG8LksELu4sMCTeAUYdqmijuAY0tKLstVtyR5Lvim6pRht4am tKdA== 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=wM7dPk/HXc1x1Fqgdd5LmhzPTPKB+/nZoreC/6x2STw=; b=Pqauysg+o7BySxztxg1xabwYWtUx4aD1BXGi3q+5NBH98+k9zAV1WCA95gsGjmL+G0 b8HkrBCGzqzaEz3gO2Q8Sv0CzKp0Sbx9rJyyKY2+eqd8gC0+OmKOyQKFzgTnqot8YmD/ CTZhJW5MpPzgkaKY6qFCSE4y/geKB0QACKCABSiX0VwjO8O7K1pfjj9E47t3TZ7guKlO B/DD+39WPJVcBRD9C9QqrroDFQRYJbb5JXepas7sLU4zH7xdg7cB8l2vFd0cQSJmXMvH f/OokRkgYpWR/eAwVCX3Q2iELJJM0U013ONGcZt1NmNA7Jia08SdZrRfLGVw8sUOHXD/ vHtw== X-Gm-Message-State: AOAM532pTiQ+KP971YwITCtlxM+YhJdv5WZyPteyB8MRiE1w0HNGxkwU o5Ufl0nFNPM0U2ioeP9zq58RvPwhV60= X-Google-Smtp-Source: ABdhPJwFhBGipgZcPo7EEObMK6xPn1kGZTv+i92rczGR7gQ/mszpyOh4VjvU6rGKpSBDg2P65gzqxQ== X-Received: by 2002:adf:e9c6:: with SMTP id l6mr8677641wrn.257.1602920302453; Sat, 17 Oct 2020 00:38:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 00:38:21 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Oct 2020 09:37:40 +0200 Message-Id: <20201017073745.403153-3-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 3/8] avcodec/movtextenc: Don't presume every style to have a font 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" Fixes segfaults in the absence of fonts; this can happen because the file didn't contain any or because the allocation of the font-string failed. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 81e8c2e802..dcdbf16e08 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -298,10 +298,14 @@ static int encode_sample_description(AVCodecContext *avctx) // is avaiable in the ASS header if (style && ass->styles_count) { // Find unique font names - av_dynarray_add(&s->fonts, &s->font_count, style->font_name); - font_names_total_len += strlen(style->font_name); + if (style->font_name) { + av_dynarray_add(&s->fonts, &s->font_count, style->font_name); + font_names_total_len += strlen(style->font_name); + } for (i = 0; i < ass->styles_count; i++) { int found = 0; + if (!ass->styles[i].font_name) + continue; for (j = 0; j < s->font_count; j++) { if (!strcmp(s->fonts[j], ass->styles[i].font_name)) { found = 1;