mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
16f98b9c29
Fixes: null pointer passed as argument 2, which is declared to never be null
Fixes: 16008/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SSA_fuzzer-5650582821404672 (this is a separate issue found in this testcase)
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 47b6ca0b02)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
85 lines
2.6 KiB
C
85 lines
2.6 KiB
C
/*
|
|
* SSA/ASS decoder
|
|
* Copyright (c) 2010 Aurelien Jacobs <aurel@gnuage.org>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <string.h>
|
|
|
|
#include "avcodec.h"
|
|
#include "ass.h"
|
|
#include "libavutil/internal.h"
|
|
#include "libavutil/mem.h"
|
|
|
|
static av_cold int ass_decode_init(AVCodecContext *avctx)
|
|
{
|
|
avctx->subtitle_header = av_malloc(avctx->extradata_size + 1);
|
|
if (!avctx->subtitle_header)
|
|
return AVERROR(ENOMEM);
|
|
if (avctx->extradata_size)
|
|
memcpy(avctx->subtitle_header, avctx->extradata, avctx->extradata_size);
|
|
avctx->subtitle_header[avctx->extradata_size] = 0;
|
|
avctx->subtitle_header_size = avctx->extradata_size;
|
|
return 0;
|
|
}
|
|
|
|
static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,
|
|
AVPacket *avpkt)
|
|
{
|
|
AVSubtitle *sub = data;
|
|
|
|
if (avpkt->size <= 0)
|
|
return avpkt->size;
|
|
|
|
sub->rects = av_malloc(sizeof(*sub->rects));
|
|
if (!sub->rects)
|
|
return AVERROR(ENOMEM);
|
|
sub->rects[0] = av_mallocz(sizeof(*sub->rects[0]));
|
|
if (!sub->rects[0])
|
|
return AVERROR(ENOMEM);
|
|
sub->num_rects = 1;
|
|
sub->rects[0]->type = SUBTITLE_ASS;
|
|
sub->rects[0]->ass = av_strdup(avpkt->data);
|
|
if (!sub->rects[0]->ass)
|
|
return AVERROR(ENOMEM);
|
|
*got_sub_ptr = 1;
|
|
return avpkt->size;
|
|
}
|
|
|
|
#if CONFIG_SSA_DECODER
|
|
AVCodec ff_ssa_decoder = {
|
|
.name = "ssa",
|
|
.long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"),
|
|
.type = AVMEDIA_TYPE_SUBTITLE,
|
|
.id = AV_CODEC_ID_ASS,
|
|
.init = ass_decode_init,
|
|
.decode = ass_decode_frame,
|
|
};
|
|
#endif
|
|
|
|
#if CONFIG_ASS_DECODER
|
|
AVCodec ff_ass_decoder = {
|
|
.name = "ass",
|
|
.long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"),
|
|
.type = AVMEDIA_TYPE_SUBTITLE,
|
|
.id = AV_CODEC_ID_ASS,
|
|
.init = ass_decode_init,
|
|
.decode = ass_decode_frame,
|
|
};
|
|
#endif
|