Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
27a9bee2
Commit
27a9bee2
authored
Sep 20, 2014
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mpl2dec: add some memory checks
parent
e833b02f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
mpl2dec.c
libavcodec/mpl2dec.c
+6
-8
No files found.
libavcodec/mpl2dec.c
View file @
27a9bee2
...
@@ -66,6 +66,7 @@ static int mpl2_event_to_ass(AVBPrint *buf, const char *p)
...
@@ -66,6 +66,7 @@ static int mpl2_event_to_ass(AVBPrint *buf, const char *p)
static
int
mpl2_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
static
int
mpl2_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_sub_ptr
,
AVPacket
*
avpkt
)
int
*
got_sub_ptr
,
AVPacket
*
avpkt
)
{
{
int
ret
=
0
;
AVBPrint
buf
;
AVBPrint
buf
;
AVSubtitle
*
sub
=
data
;
AVSubtitle
*
sub
=
data
;
const
char
*
ptr
=
avpkt
->
data
;
const
char
*
ptr
=
avpkt
->
data
;
...
@@ -74,15 +75,12 @@ static int mpl2_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -74,15 +75,12 @@ static int mpl2_decode_frame(AVCodecContext *avctx, void *data,
av_rescale_q
(
avpkt
->
duration
,
avctx
->
time_base
,
(
AVRational
){
1
,
100
})
:
-
1
;
av_rescale_q
(
avpkt
->
duration
,
avctx
->
time_base
,
(
AVRational
){
1
,
100
})
:
-
1
;
av_bprint_init
(
&
buf
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
av_bprint_init
(
&
buf
,
0
,
AV_BPRINT_SIZE_UNLIMITED
);
if
(
ptr
&&
avpkt
->
size
>
0
&&
*
ptr
&&
!
mpl2_event_to_ass
(
&
buf
,
ptr
))
{
if
(
ptr
&&
avpkt
->
size
>
0
&&
*
ptr
&&
!
mpl2_event_to_ass
(
&
buf
,
ptr
))
if
(
!
av_bprint_is_complete
(
&
buf
))
{
ret
=
ff_ass_add_rect_bprint
(
sub
,
&
buf
,
ts_start
,
ts_duration
,
0
);
av_bprint_finalize
(
&
buf
,
NULL
);
return
AVERROR
(
ENOMEM
);
}
ff_ass_add_rect
(
sub
,
buf
.
str
,
ts_start
,
ts_duration
,
0
);
}
*
got_sub_ptr
=
sub
->
num_rects
>
0
;
av_bprint_finalize
(
&
buf
,
NULL
);
av_bprint_finalize
(
&
buf
,
NULL
);
if
(
ret
<
0
)
return
ret
;
*
got_sub_ptr
=
sub
->
num_rects
>
0
;
return
avpkt
->
size
;
return
avpkt
->
size
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment