Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
9cdf74f9
Commit
9cdf74f9
authored
Jun 13, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/audio: use av_samples_copy() instead of custom code.
Fixes a possible invalid write, found by Nicolas George.
parent
ce03b088
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
audio.c
libavfilter/audio.c
+4
-6
No files found.
libavfilter/audio.c
View file @
9cdf74f9
...
...
@@ -185,10 +185,6 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
/* prepare to copy the samples if the buffer has insufficient permissions */
if
((
dst
->
min_perms
&
samplesref
->
perms
)
!=
dst
->
min_perms
||
dst
->
rej_perms
&
samplesref
->
perms
)
{
int
i
,
planar
=
av_sample_fmt_is_planar
(
samplesref
->
format
);
int
planes
=
!
planar
?
1
:
av_get_channel_layout_nb_channels
(
samplesref
->
audio
->
channel_layout
);
av_log
(
link
->
dst
,
AV_LOG_DEBUG
,
"Copying audio data in avfilter (have perms %x, need %x, reject %x)
\n
"
,
samplesref
->
perms
,
link
->
dstpad
->
min_perms
,
link
->
dstpad
->
rej_perms
);
...
...
@@ -199,8 +195,10 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
link
->
cur_buf
->
audio
->
sample_rate
=
samplesref
->
audio
->
sample_rate
;
/* Copy actual data into new samples buffer */
for
(
i
=
0
;
i
<
planes
;
i
++
)
memcpy
(
link
->
cur_buf
->
extended_data
[
i
],
samplesref
->
extended_data
[
i
],
samplesref
->
linesize
[
0
]);
av_samples_copy
(
link
->
cur_buf
->
extended_data
,
samplesref
->
extended_data
,
0
,
0
,
samplesref
->
audio
->
nb_samples
,
av_get_channel_layout_nb_channels
(
link
->
channel_layout
),
link
->
format
);
avfilter_unref_buffer
(
samplesref
);
}
else
...
...
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