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
b4886795
Commit
b4886795
authored
Nov 27, 2011
by
Peter Ross
Committed by
Michael Niedermayer
Nov 27, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
iff: fix invalid reads (ticket 689)
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
801393bc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
iff.c
libavcodec/iff.c
+2
-2
No files found.
libavcodec/iff.c
View file @
b4886795
...
@@ -464,7 +464,7 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
...
@@ -464,7 +464,7 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
}
else
if
(
s
->
ham
)
{
// HAM to PIX_FMT_BGR32
}
else
if
(
s
->
ham
)
{
// HAM to PIX_FMT_BGR32
for
(
y
=
0
;
y
<
avctx
->
height
;
y
++
)
{
for
(
y
=
0
;
y
<
avctx
->
height
;
y
++
)
{
uint8_t
*
row
=
&
s
->
frame
.
data
[
0
][
y
*
s
->
frame
.
linesize
[
0
]
];
uint8_t
*
row
=
&
s
->
frame
.
data
[
0
][
y
*
s
->
frame
.
linesize
[
0
]
];
memset
(
s
->
ham_buf
,
0
,
avctx
->
width
);
memset
(
s
->
ham_buf
,
0
,
s
->
planesize
*
8
);
for
(
plane
=
0
;
plane
<
s
->
bpp
&&
buf
<
buf_end
;
plane
++
)
{
for
(
plane
=
0
;
plane
<
s
->
bpp
&&
buf
<
buf_end
;
plane
++
)
{
decodeplane8
(
s
->
ham_buf
,
buf
,
FFMIN
(
s
->
planesize
,
buf_end
-
buf
),
plane
);
decodeplane8
(
s
->
ham_buf
,
buf
,
FFMIN
(
s
->
planesize
,
buf_end
-
buf
),
plane
);
buf
+=
s
->
planesize
;
buf
+=
s
->
planesize
;
...
@@ -540,7 +540,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
...
@@ -540,7 +540,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
}
else
if
(
s
->
ham
)
{
// HAM to PIX_FMT_BGR32
}
else
if
(
s
->
ham
)
{
// HAM to PIX_FMT_BGR32
for
(
y
=
0
;
y
<
avctx
->
height
;
y
++
)
{
for
(
y
=
0
;
y
<
avctx
->
height
;
y
++
)
{
uint8_t
*
row
=
&
s
->
frame
.
data
[
0
][
y
*
s
->
frame
.
linesize
[
0
]];
uint8_t
*
row
=
&
s
->
frame
.
data
[
0
][
y
*
s
->
frame
.
linesize
[
0
]];
memset
(
s
->
ham_buf
,
0
,
avctx
->
width
);
memset
(
s
->
ham_buf
,
0
,
s
->
planesize
*
8
);
for
(
plane
=
0
;
plane
<
s
->
bpp
;
plane
++
)
{
for
(
plane
=
0
;
plane
<
s
->
bpp
;
plane
++
)
{
buf
+=
decode_byterun
(
s
->
planebuf
,
s
->
planesize
,
buf
,
buf_end
);
buf
+=
decode_byterun
(
s
->
planebuf
,
s
->
planesize
,
buf
,
buf_end
);
decodeplane8
(
s
->
ham_buf
,
s
->
planebuf
,
s
->
planesize
,
plane
);
decodeplane8
(
s
->
ham_buf
,
s
->
planebuf
,
s
->
planesize
,
plane
);
...
...
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