Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
24947d49
Commit
24947d49
authored
Jan 11, 2012
by
Ronald S. Bultje
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vorbis: fix overflows in floor1[] vector and inverse db table index.
parent
7e4d9d5d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
15 deletions
+14
-15
vorbis.c
libavcodec/vorbis.c
+9
-10
vorbisdec.c
libavcodec/vorbisdec.c
+5
-5
No files found.
libavcodec/vorbis.c
View file @
24947d49
...
...
@@ -152,7 +152,7 @@ void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values)
}
}
static
inline
void
render_line_unrolled
(
intptr_t
x
,
uint8_
t
y
,
int
x1
,
static
inline
void
render_line_unrolled
(
intptr_t
x
,
in
t
y
,
int
x1
,
intptr_t
sy
,
int
ady
,
int
adx
,
float
*
buf
)
{
...
...
@@ -164,30 +164,30 @@ static inline void render_line_unrolled(intptr_t x, uint8_t y, int x1,
if
(
err
>=
0
)
{
err
+=
ady
-
adx
;
y
+=
sy
;
buf
[
x
++
]
=
ff_vorbis_floor1_inverse_db_table
[
y
];
buf
[
x
++
]
=
ff_vorbis_floor1_inverse_db_table
[
av_clip_uint8
(
y
)
];
}
buf
[
x
]
=
ff_vorbis_floor1_inverse_db_table
[
y
];
buf
[
x
]
=
ff_vorbis_floor1_inverse_db_table
[
av_clip_uint8
(
y
)
];
}
if
(
x
<=
0
)
{
if
(
err
+
ady
>=
0
)
y
+=
sy
;
buf
[
x
]
=
ff_vorbis_floor1_inverse_db_table
[
y
];
buf
[
x
]
=
ff_vorbis_floor1_inverse_db_table
[
av_clip_uint8
(
y
)
];
}
}
static
void
render_line
(
int
x0
,
uint8_
t
y0
,
int
x1
,
int
y1
,
float
*
buf
)
static
void
render_line
(
int
x0
,
in
t
y0
,
int
x1
,
int
y1
,
float
*
buf
)
{
int
dy
=
y1
-
y0
;
int
adx
=
x1
-
x0
;
int
ady
=
FFABS
(
dy
);
int
sy
=
dy
<
0
?
-
1
:
1
;
buf
[
x0
]
=
ff_vorbis_floor1_inverse_db_table
[
y0
];
buf
[
x0
]
=
ff_vorbis_floor1_inverse_db_table
[
av_clip_uint8
(
y0
)
];
if
(
ady
*
2
<=
adx
)
{
// optimized common case
render_line_unrolled
(
x0
,
y0
,
x1
,
sy
,
ady
,
adx
,
buf
);
}
else
{
int
base
=
dy
/
adx
;
int
x
=
x0
;
uint8_t
y
=
y0
;
int
y
=
y0
;
int
err
=
-
adx
;
ady
-=
FFABS
(
base
)
*
adx
;
while
(
++
x
<
x1
)
{
...
...
@@ -197,7 +197,7 @@ static void render_line(int x0, uint8_t y0, int x1, int y1, float *buf)
err
-=
adx
;
y
+=
sy
;
}
buf
[
x
]
=
ff_vorbis_floor1_inverse_db_table
[
y
];
buf
[
x
]
=
ff_vorbis_floor1_inverse_db_table
[
av_clip_uint8
(
y
)
];
}
}
}
...
...
@@ -206,8 +206,7 @@ void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
uint16_t
*
y_list
,
int
*
flag
,
int
multiplier
,
float
*
out
,
int
samples
)
{
int
lx
,
i
;
uint8_t
ly
;
int
lx
,
ly
,
i
;
lx
=
0
;
ly
=
y_list
[
0
]
*
multiplier
;
for
(
i
=
1
;
i
<
values
;
i
++
)
{
...
...
libavcodec/vorbisdec.c
View file @
24947d49
...
...
@@ -1244,20 +1244,20 @@ static int vorbis_floor1_decode(vorbis_context *vc,
floor1_flag
[
i
]
=
1
;
if
(
val
>=
room
)
{
if
(
highroom
>
lowroom
)
{
floor1_Y_final
[
i
]
=
val
-
lowroom
+
predicted
;
floor1_Y_final
[
i
]
=
av_clip_uint16
(
val
-
lowroom
+
predicted
)
;
}
else
{
floor1_Y_final
[
i
]
=
predicted
-
val
+
highroom
-
1
;
floor1_Y_final
[
i
]
=
av_clip_uint16
(
predicted
-
val
+
highroom
-
1
)
;
}
}
else
{
if
(
val
&
1
)
{
floor1_Y_final
[
i
]
=
predicted
-
(
val
+
1
)
/
2
;
floor1_Y_final
[
i
]
=
av_clip_uint16
(
predicted
-
(
val
+
1
)
/
2
)
;
}
else
{
floor1_Y_final
[
i
]
=
predicted
+
val
/
2
;
floor1_Y_final
[
i
]
=
av_clip_uint16
(
predicted
+
val
/
2
)
;
}
}
}
else
{
floor1_flag
[
i
]
=
0
;
floor1_Y_final
[
i
]
=
predicted
;
floor1_Y_final
[
i
]
=
av_clip_uint16
(
predicted
)
;
}
av_dlog
(
NULL
,
" Decoded floor(%d) = %u / val %u
\n
"
,
...
...
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