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
2fe04630
Commit
2fe04630
authored
May 25, 2016
by
Andriy Lysnevych
Committed by
Michael Niedermayer
Jun 01, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/avpacket: Respect payload offset in av_grow_packet
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
d1efdd54
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
7 deletions
+21
-7
avpacket.c
libavcodec/avpacket.c
+21
-7
No files found.
libavcodec/avpacket.c
View file @
2fe04630
...
...
@@ -110,24 +110,38 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
{
int
new_size
;
av_assert0
((
unsigned
)
pkt
->
size
<=
INT_MAX
-
AV_INPUT_BUFFER_PADDING_SIZE
);
if
(
!
pkt
->
size
)
return
av_new_packet
(
pkt
,
grow_by
);
if
((
unsigned
)
grow_by
>
INT_MAX
-
(
pkt
->
size
+
AV_INPUT_BUFFER_PADDING_SIZE
))
return
-
1
;
new_size
=
pkt
->
size
+
grow_by
+
AV_INPUT_BUFFER_PADDING_SIZE
;
if
(
pkt
->
buf
)
{
int
ret
=
av_buffer_realloc
(
&
pkt
->
buf
,
new_size
);
if
(
ret
<
0
)
return
ret
;
size_t
data_offset
;
uint8_t
*
old_data
=
pkt
->
data
;
if
(
pkt
->
data
==
NULL
)
{
data_offset
=
0
;
pkt
->
data
=
pkt
->
buf
->
data
;
}
else
{
data_offset
=
pkt
->
data
-
pkt
->
buf
->
data
;
if
(
data_offset
>
INT_MAX
-
new_size
)
return
-
1
;
}
if
(
new_size
+
data_offset
>
pkt
->
buf
->
size
)
{
int
ret
=
av_buffer_realloc
(
&
pkt
->
buf
,
new_size
+
data_offset
);
if
(
ret
<
0
)
{
pkt
->
data
=
old_data
;
return
ret
;
}
pkt
->
data
=
pkt
->
buf
->
data
+
data_offset
;
}
}
else
{
pkt
->
buf
=
av_buffer_alloc
(
new_size
);
if
(
!
pkt
->
buf
)
return
AVERROR
(
ENOMEM
);
memcpy
(
pkt
->
buf
->
data
,
pkt
->
data
,
FFMIN
(
pkt
->
size
,
pkt
->
size
+
grow_by
));
memcpy
(
pkt
->
buf
->
data
,
pkt
->
data
,
pkt
->
size
);
pkt
->
data
=
pkt
->
buf
->
data
;
}
pkt
->
data
=
pkt
->
buf
->
data
;
pkt
->
size
+=
grow_by
;
memset
(
pkt
->
data
+
pkt
->
size
,
0
,
AV_INPUT_BUFFER_PADDING_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