X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fwebvttenc.c;h=95f58e2942be21830e091a4bdd31095d1862b3b3;hb=ef6a9e5e311f09fa8032974fa4d0c1e166a959bb;hp=61b7f5462299412f21340f5a341c12fa050b20fd;hpb=fda424b300c1a0b991296aa585691609d01196bd;p=ffmpeg diff --git a/libavformat/webvttenc.c b/libavformat/webvttenc.c index 61b7f546229..95f58e2942b 100644 --- a/libavformat/webvttenc.c +++ b/libavformat/webvttenc.c @@ -57,7 +57,6 @@ static int webvtt_write_header(AVFormatContext *ctx) avpriv_set_pts_info(s, 64, 1, 1000); avio_printf(pb, "WEBVTT\n"); - avio_flush(pb); return 0; } @@ -65,7 +64,8 @@ static int webvtt_write_header(AVFormatContext *ctx) static int webvtt_write_packet(AVFormatContext *ctx, AVPacket *pkt) { AVIOContext *pb = ctx->pb; - int id_size, settings_size; + size_t id_size, settings_size; + int id_size_int, settings_size_int; uint8_t *id, *settings; avio_printf(pb, "\n"); @@ -73,8 +73,12 @@ static int webvtt_write_packet(AVFormatContext *ctx, AVPacket *pkt) id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); - if (id && id_size > 0) - avio_printf(pb, "%.*s\n", id_size, id); + if (id_size > INT_MAX) + return AVERROR(EINVAL); + + id_size_int = id_size; + if (id && id_size_int > 0) + avio_printf(pb, "%.*s\n", id_size_int, id); webvtt_write_time(pb, pkt->pts); avio_printf(pb, " --> "); @@ -83,8 +87,12 @@ static int webvtt_write_packet(AVFormatContext *ctx, AVPacket *pkt) settings = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); - if (settings && settings_size > 0) - avio_printf(pb, " %.*s", settings_size, settings); + if (settings_size > INT_MAX) + return AVERROR(EINVAL); + + settings_size_int = settings_size; + if (settings && settings_size_int > 0) + avio_printf(pb, " %.*s", settings_size_int, settings); avio_printf(pb, "\n");