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
2da5a5ce
Commit
2da5a5ce
authored
Aug 07, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gifdec: return more meaningful error codes
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
f6428896
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
gifdec.c
libavcodec/gifdec.c
+8
-8
No files found.
libavcodec/gifdec.c
View file @
2da5a5ce
...
@@ -206,13 +206,13 @@ static int gif_read_header1(GifState *s)
...
@@ -206,13 +206,13 @@ static int gif_read_header1(GifState *s)
int
has_global_palette
;
int
has_global_palette
;
if
(
s
->
bytestream_end
<
s
->
bytestream
+
13
)
if
(
s
->
bytestream_end
<
s
->
bytestream
+
13
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
/* read gif signature */
/* read gif signature */
bytestream_get_buffer
(
&
s
->
bytestream
,
sig
,
6
);
bytestream_get_buffer
(
&
s
->
bytestream
,
sig
,
6
);
if
(
memcmp
(
sig
,
gif87a_sig
,
6
)
!=
0
&&
if
(
memcmp
(
sig
,
gif87a_sig
,
6
)
!=
0
&&
memcmp
(
sig
,
gif89a_sig
,
6
)
!=
0
)
memcmp
(
sig
,
gif89a_sig
,
6
)
!=
0
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
/* read screen header */
/* read screen header */
s
->
transparent_color_index
=
-
1
;
s
->
transparent_color_index
=
-
1
;
...
@@ -221,7 +221,7 @@ static int gif_read_header1(GifState *s)
...
@@ -221,7 +221,7 @@ static int gif_read_header1(GifState *s)
if
(
(
unsigned
)
s
->
screen_width
>
32767
if
(
(
unsigned
)
s
->
screen_width
>
32767
||
(
unsigned
)
s
->
screen_height
>
32767
){
||
(
unsigned
)
s
->
screen_height
>
32767
){
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"picture size too large
\n
"
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"picture size too large
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
}
v
=
bytestream_get_byte
(
&
s
->
bytestream
);
v
=
bytestream_get_byte
(
&
s
->
bytestream
);
...
@@ -238,7 +238,7 @@ static int gif_read_header1(GifState *s)
...
@@ -238,7 +238,7 @@ static int gif_read_header1(GifState *s)
if
(
has_global_palette
)
{
if
(
has_global_palette
)
{
n
=
1
<<
s
->
bits_per_pixel
;
n
=
1
<<
s
->
bits_per_pixel
;
if
(
s
->
bytestream_end
<
s
->
bytestream
+
n
*
3
)
if
(
s
->
bytestream_end
<
s
->
bytestream
+
n
*
3
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
bytestream_get_buffer
(
&
s
->
bytestream
,
s
->
global_palette
,
n
*
3
);
bytestream_get_buffer
(
&
s
->
bytestream
,
s
->
global_palette
,
n
*
3
);
}
}
return
0
;
return
0
;
...
@@ -291,8 +291,8 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, A
...
@@ -291,8 +291,8 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, A
s
->
bytestream
=
buf
;
s
->
bytestream
=
buf
;
s
->
bytestream_end
=
buf
+
buf_size
;
s
->
bytestream_end
=
buf
+
buf_size
;
if
(
gif_read_header1
(
s
)
<
0
)
if
(
(
ret
=
gif_read_header1
(
s
)
)
<
0
)
return
-
1
;
return
ret
;
avctx
->
pix_fmt
=
PIX_FMT_PAL8
;
avctx
->
pix_fmt
=
PIX_FMT_PAL8
;
if
(
av_image_check_size
(
s
->
screen_width
,
s
->
screen_height
,
0
,
avctx
))
if
(
av_image_check_size
(
s
->
screen_width
,
s
->
screen_height
,
0
,
avctx
))
...
@@ -301,9 +301,9 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, A
...
@@ -301,9 +301,9 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, A
if
(
s
->
picture
.
data
[
0
])
if
(
s
->
picture
.
data
[
0
])
avctx
->
release_buffer
(
avctx
,
&
s
->
picture
);
avctx
->
release_buffer
(
avctx
,
&
s
->
picture
);
if
(
avctx
->
get_buffer
(
avctx
,
&
s
->
picture
)
<
0
)
{
if
(
(
ret
=
avctx
->
get_buffer
(
avctx
,
&
s
->
picture
)
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
-
1
;
return
ret
;
}
}
s
->
image_palette
=
(
uint32_t
*
)
s
->
picture
.
data
[
1
];
s
->
image_palette
=
(
uint32_t
*
)
s
->
picture
.
data
[
1
];
ret
=
gif_parse_next_image
(
s
);
ret
=
gif_parse_next_image
(
s
);
...
...
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