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
86f86877
Commit
86f86877
authored
May 26, 2011
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
id3v2: Check malloc result. ID3v2 tags can be very large.
parent
40a5dd2f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
id3v2.c
libavformat/id3v2.c
+6
-1
No files found.
libavformat/id3v2.c
View file @
86f86877
...
...
@@ -237,7 +237,7 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
tag
[
3
]
=
0
;
tlen
=
avio_rb24
(
s
->
pb
);
}
if
(
tlen
<
0
||
tlen
>
len
-
taghdrlen
)
{
if
(
tlen
<
=
0
||
tlen
>
len
-
taghdrlen
)
{
av_log
(
s
,
AV_LOG_WARNING
,
"Invalid size in frame %s, skipping the rest of tag.
\n
"
,
tag
);
break
;
}
...
...
@@ -256,6 +256,10 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
if
(
unsync
||
tunsync
)
{
int
i
,
j
;
av_fast_malloc
(
&
buffer
,
&
buffer_size
,
tlen
);
if
(
!
buffer
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Failed to alloc %d bytes
\n
"
,
tlen
);
goto
seek
;
}
for
(
i
=
0
,
j
=
0
;
i
<
tlen
;
i
++
,
j
++
)
{
buffer
[
j
]
=
avio_r8
(
s
->
pb
);
if
(
j
>
0
&&
!
buffer
[
j
]
&&
buffer
[
j
-
1
]
==
0xff
)
{
...
...
@@ -276,6 +280,7 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
break
;
}
/* Skip to end of tag */
seek:
avio_seek
(
s
->
pb
,
next
,
SEEK_SET
);
}
...
...
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