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
d1916d13
Commit
d1916d13
authored
Aug 30, 2013
by
Michael Niedermayer
Committed by
Vittorio Giovara
Nov 28, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dsputil/pngdsp: fix signed/unsigned type in end comparison
Fixes out of array accesses and integer overflows.
parent
0673ede9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
dsputil.c
libavcodec/dsputil.c
+2
-2
pngdsp.c
libavcodec/pngdsp.c
+1
-1
No files found.
libavcodec/dsputil.c
View file @
d1916d13
...
...
@@ -1742,7 +1742,7 @@ void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type){
static
void
add_bytes_c
(
uint8_t
*
dst
,
uint8_t
*
src
,
int
w
){
long
i
;
for
(
i
=
0
;
i
<=
w
-
sizeof
(
long
);
i
+=
sizeof
(
long
))
{
for
(
i
=
0
;
i
<=
w
-
(
int
)
sizeof
(
long
);
i
+=
sizeof
(
long
))
{
long
a
=
*
(
long
*
)(
src
+
i
);
long
b
=
*
(
long
*
)(
dst
+
i
);
*
(
long
*
)(
dst
+
i
)
=
((
a
&
pb_7f
)
+
(
b
&
pb_7f
))
^
((
a
^
b
)
&
pb_80
);
...
...
@@ -1767,7 +1767,7 @@ static void diff_bytes_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w){
}
}
else
#endif
for
(
i
=
0
;
i
<=
w
-
sizeof
(
long
);
i
+=
sizeof
(
long
))
{
for
(
i
=
0
;
i
<=
w
-
(
int
)
sizeof
(
long
);
i
+=
sizeof
(
long
))
{
long
a
=
*
(
long
*
)(
src1
+
i
);
long
b
=
*
(
long
*
)(
src2
+
i
);
*
(
long
*
)(
dst
+
i
)
=
((
a
|
pb_80
)
-
(
b
&
pb_7f
))
^
((
a
^
b
^
pb_80
)
&
pb_80
);
...
...
libavcodec/pngdsp.c
View file @
d1916d13
...
...
@@ -31,7 +31,7 @@
static
void
add_bytes_l2_c
(
uint8_t
*
dst
,
uint8_t
*
src1
,
uint8_t
*
src2
,
int
w
)
{
long
i
;
for
(
i
=
0
;
i
<=
w
-
sizeof
(
long
);
i
+=
sizeof
(
long
))
{
for
(
i
=
0
;
i
<=
w
-
(
int
)
sizeof
(
long
);
i
+=
sizeof
(
long
))
{
long
a
=
*
(
long
*
)(
src1
+
i
);
long
b
=
*
(
long
*
)(
src2
+
i
);
*
(
long
*
)(
dst
+
i
)
=
((
a
&
pb_7f
)
+
(
b
&
pb_7f
))
^
((
a
^
b
)
&
pb_80
);
...
...
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