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
ff07ec14
Commit
ff07ec14
authored
Sep 29, 2013
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcx: Return an error on broken palette if err_detect is set to 'explode'
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
d1d99e3b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
pcx.c
libavcodec/pcx.c
+4
-2
No files found.
libavcodec/pcx.c
View file @
ff07ec14
...
@@ -171,7 +171,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
...
@@ -171,7 +171,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if
(
buf_size
<
769
)
{
if
(
buf_size
<
769
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"File is too short
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"File is too short
\n
"
);
ret
=
buf_size
;
ret
=
avctx
->
err_recognition
&
AV_EF_EXPLODE
?
AVERROR_INVALIDDATA
:
buf_size
;
goto
end
;
goto
end
;
}
}
...
@@ -187,7 +188,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
...
@@ -187,7 +188,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
}
}
if
(
*
buf
++
!=
12
)
{
if
(
*
buf
++
!=
12
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"expected palette after image data
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"expected palette after image data
\n
"
);
ret
=
buf_size
;
ret
=
avctx
->
err_recognition
&
AV_EF_EXPLODE
?
AVERROR_INVALIDDATA
:
buf_size
;
goto
end
;
goto
end
;
}
}
}
else
if
(
nplanes
==
1
)
{
/* all packed formats, max. 16 colors */
}
else
if
(
nplanes
==
1
)
{
/* all packed formats, max. 16 colors */
...
...
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