From patchwork Thu Dec 13 13:06:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11403 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 63B6644DF2B for ; Thu, 13 Dec 2018 15:06:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 864EA68A92C; Thu, 13 Dec 2018 15:06:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E63CC68A82B for ; Thu, 13 Dec 2018 15:06:26 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id s14so2290701wmh.1 for ; Thu, 13 Dec 2018 05:06:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=LOhqLD2Be1gELC9el4Lm5bV/KSjBR70WAZtoUlEle0o=; b=Lwj5sjKRxwntgvo/XwLKGxuuFAGC+2sr8AMx7pik0LZlCnj2wJXKxiLLY0YfI4QCtX Wk0J8XeCJKqnI7ckFwvjMUvPSwY2+DrvOrOpYyb1XH5HFyzLnDnG8J/6d/zICqpo1LKO 7YKW9XhlH2zQb0/P2r80W4rwnrlKSpe+rMVXI88IQmPb2ftIIrEzu417WL2iu3QweekT dNiNNGuA0LLiz+VT3qdnmaF5jk74dZkECVI1zQZ6ND6886Cu+H3F25iapfYqng5bEnPt wronJGFdcBoVTaDDC50Bxq9IpIVmdetRgXfyCyYaEXhda9PZUsGJCr26eSR5eevcDYjz pBTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=LOhqLD2Be1gELC9el4Lm5bV/KSjBR70WAZtoUlEle0o=; b=Q3JcWUPJxSFAxJ+X/ldiTtCmnsaSIfcw+rCETv7CLuy6h9f16MwAj44BDo2gSiKUmm gcU+CMtprh2R065uW33pMdiawxKgxqhTXW5QZh6m5nLtrRksKfWqb+PwnVawjxOkV4gy I3G50RPp953SbHD5kiX66wQ6bcFvq0gSmdEaik677l4BcskLmkKCahs8EAaogHhc0Pmk wcw5xpHkp1mIscp1lAcqF5lhXqaQTpdA8zAiU7HZnwg7gHxrl4qmEULb+lLkDSO0oegz GRZN7k3+k9WpHZWcwv2jno6IYD/WzBLDaEbZ1+ncXLiLwdyafrDwbDKcJVklQAToxTwP 7dbA== X-Gm-Message-State: AA+aEWaEO3drgTZJzHfK0PzIDWNi/Ec31rUszyje+rYhCZLhe/J6DeRc /QBz8mWTaca7Jzcj8FOnrh5ZApjc X-Google-Smtp-Source: AFSGD/WOkMAR0C8dzS+X9IDMn/QsyIXReafmJwoB8ZW1NOZVtdzEYPVS0J5wpZGFpvgQkyS/HhX+Bg== X-Received: by 2002:a1c:2007:: with SMTP id g7mr9899118wmg.79.1544706385683; Thu, 13 Dec 2018 05:06:25 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id r77sm2999248wmd.22.2018.12.13.05.06.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 05:06:25 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Dec 2018 14:06:18 +0100 Message-Id: <20181213130618.19336-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181213120925.14531-1-onemda@gmail.com> References: <20181213120925.14531-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH] avformat/ffmetadec: do no limit size of tags to 1024 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use bprint API instead. Fixes #4833. Signed-off-by: Paul B Mahol --- libavformat/ffmetadec.c | 57 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index 3290b3b7bc..6f7133e389 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/bprint.h" #include "libavutil/mathematics.h" #include "avformat.h" #include "ffmeta.h" @@ -32,6 +33,48 @@ static int probe(AVProbeData *p) return 0; } +static int64_t read_line_to_bprint_escaped(AVIOContext *s, AVBPrint *bp) +{ + int len, end; + int64_t read = 0; + char tmp[1024]; + char c; + char prev = ' '; + + do { + len = 0; + do { + c = avio_r8(s); + end = prev != '\\' && (c == '\r' || c == '\n' || c == '\0'); + if (!end) + tmp[len++] = c; + prev = c; + } while (!end && len < sizeof(tmp)); + av_bprint_append_data(bp, tmp, len); + read += len; + } while (!end); + + if (c == '\r' && avio_r8(s) != '\n' && !avio_feof(s)) + avio_skip(s, -1); + + if (!c && s->error) + return s->error; + + if (!c && !read && avio_feof(s)) + return AVERROR_EOF; + + return read; +} + +static void get_bprint_line(AVIOContext *s, AVBPrint *bp) +{ + + do { + av_bprint_clear(bp); + read_line_to_bprint_escaped(s, bp); + } while (!avio_feof(s) && (bp->str[0] == ';' || bp->str[0] == '#' || bp->str[0] == 0)); +} + static void get_line(AVIOContext *s, uint8_t *buf, int size) { do { @@ -128,12 +171,14 @@ static int read_tag(const uint8_t *line, AVDictionary **m) static int read_header(AVFormatContext *s) { AVDictionary **m = &s->metadata; - uint8_t line[1024]; + AVBPrint bp; + + av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED); while(!avio_feof(s->pb)) { - get_line(s->pb, line, sizeof(line)); + get_bprint_line(s->pb, &bp); - if (!memcmp(line, ID_STREAM, strlen(ID_STREAM))) { + if (!memcmp(bp.str, ID_STREAM, strlen(ID_STREAM))) { AVStream *st = avformat_new_stream(s, NULL); if (!st) @@ -143,7 +188,7 @@ static int read_header(AVFormatContext *s) st->codecpar->codec_id = AV_CODEC_ID_FFMETADATA; m = &st->metadata; - } else if (!memcmp(line, ID_CHAPTER, strlen(ID_CHAPTER))) { + } else if (!memcmp(bp.str, ID_CHAPTER, strlen(ID_CHAPTER))) { AVChapter *ch = read_chapter(s); if (!ch) @@ -151,9 +196,11 @@ static int read_header(AVFormatContext *s) m = &ch->metadata; } else - read_tag(line, m); + read_tag(bp.str, m); } + av_bprint_finalize(&bp, NULL); + s->start_time = 0; if (s->nb_chapters) s->duration = av_rescale_q(s->chapters[s->nb_chapters - 1]->end,