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
e05253bf
Commit
e05253bf
authored
Mar 11, 2012
by
Peter Ross
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
iff: do not decode unsupported pbms with ham decoder
This prevents the segfault reported by ticket #1054
parent
b25a265a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
iff.c
libavcodec/iff.c
+4
-1
No files found.
libavcodec/iff.c
View file @
e05253bf
...
@@ -638,12 +638,15 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
...
@@ -638,12 +638,15 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
uint8_t
*
row
=
&
s
->
frame
.
data
[
0
][
y
*
s
->
frame
.
linesize
[
0
]];
uint8_t
*
row
=
&
s
->
frame
.
data
[
0
][
y
*
s
->
frame
.
linesize
[
0
]];
buf
+=
decode_byterun
(
row
,
avctx
->
width
,
buf
,
buf_end
);
buf
+=
decode_byterun
(
row
,
avctx
->
width
,
buf
,
buf_end
);
}
}
}
else
{
// IFF-PBM: HAM to PIX_FMT_BGR32
}
else
if
(
s
->
ham
)
{
// IFF-PBM: 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
]];
buf
+=
decode_byterun
(
s
->
ham_buf
,
avctx
->
width
,
buf
,
buf_end
);
buf
+=
decode_byterun
(
s
->
ham_buf
,
avctx
->
width
,
buf
,
buf_end
);
decode_ham_plane32
((
uint32_t
*
)
row
,
s
->
ham_buf
,
s
->
ham_palbuf
,
s
->
planesize
);
decode_ham_plane32
((
uint32_t
*
)
row
,
s
->
ham_buf
,
s
->
ham_palbuf
,
s
->
planesize
);
}
}
}
else
{
av_log_ask_for_sample
(
avctx
,
"unsupported bpp
\n
"
);
return
AVERROR_INVALIDDATA
;
}
}
}
}
...
...
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