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
dbe29db8
Commit
dbe29db8
authored
Apr 18, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aacdec: more verbose overread error message
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
68526dbc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
aacdec.c
libavcodec/aacdec.c
+6
-6
No files found.
libavcodec/aacdec.c
View file @
dbe29db8
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
static
VLC
vlc_scalefactors
;
static
VLC
vlc_scalefactors
;
static
VLC
vlc_spectral
[
11
];
static
VLC
vlc_spectral
[
11
];
static
const
char
overread_err
[]
=
"Input buffer exhausted before END element found
\n
"
;
#define overread_err "Input buffer exhausted before END element found\n"
static
int
count_channels
(
uint8_t
(
*
layout
)[
3
],
int
tags
)
static
int
count_channels
(
uint8_t
(
*
layout
)[
3
],
int
tags
)
{
{
...
@@ -607,7 +607,7 @@ static int decode_pce(AVCodecContext *avctx, MPEG4AudioConfig *m4ac,
...
@@ -607,7 +607,7 @@ static int decode_pce(AVCodecContext *avctx, MPEG4AudioConfig *m4ac,
skip_bits
(
gb
,
3
);
// mixdown_coeff_index and pseudo_surround
skip_bits
(
gb
,
3
);
// mixdown_coeff_index and pseudo_surround
if
(
get_bits_left
(
gb
)
<
4
*
(
num_front
+
num_side
+
num_back
+
num_lfe
+
num_assoc_data
+
num_cc
))
{
if
(
get_bits_left
(
gb
)
<
4
*
(
num_front
+
num_side
+
num_back
+
num_lfe
+
num_assoc_data
+
num_cc
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
overread_err
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"decode_pce: "
overread_err
);
return
-
1
;
return
-
1
;
}
}
decode_channel_map
(
layout_map
,
AAC_CHANNEL_FRONT
,
gb
,
num_front
);
decode_channel_map
(
layout_map
,
AAC_CHANNEL_FRONT
,
gb
,
num_front
);
...
@@ -629,7 +629,7 @@ static int decode_pce(AVCodecContext *avctx, MPEG4AudioConfig *m4ac,
...
@@ -629,7 +629,7 @@ static int decode_pce(AVCodecContext *avctx, MPEG4AudioConfig *m4ac,
/* comment field, first byte is length */
/* comment field, first byte is length */
comment_len
=
get_bits
(
gb
,
8
)
*
8
;
comment_len
=
get_bits
(
gb
,
8
)
*
8
;
if
(
get_bits_left
(
gb
)
<
comment_len
)
{
if
(
get_bits_left
(
gb
)
<
comment_len
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
overread_err
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"decode_pce: "
overread_err
);
return
-
1
;
return
-
1
;
}
}
skip_bits_long
(
gb
,
comment_len
);
skip_bits_long
(
gb
,
comment_len
);
...
@@ -928,7 +928,7 @@ static int skip_data_stream_element(AACContext *ac, GetBitContext *gb)
...
@@ -928,7 +928,7 @@ static int skip_data_stream_element(AACContext *ac, GetBitContext *gb)
align_get_bits
(
gb
);
align_get_bits
(
gb
);
if
(
get_bits_left
(
gb
)
<
8
*
count
)
{
if
(
get_bits_left
(
gb
)
<
8
*
count
)
{
av_log
(
ac
->
avctx
,
AV_LOG_ERROR
,
overread_err
);
av_log
(
ac
->
avctx
,
AV_LOG_ERROR
,
"skip_data_stream_element: "
overread_err
);
return
-
1
;
return
-
1
;
}
}
skip_bits_long
(
gb
,
8
*
count
);
skip_bits_long
(
gb
,
8
*
count
);
...
@@ -1062,7 +1062,7 @@ static int decode_band_types(AACContext *ac, enum BandType band_type[120],
...
@@ -1062,7 +1062,7 @@ static int decode_band_types(AACContext *ac, enum BandType band_type[120],
sect_len_incr
=
get_bits
(
gb
,
bits
);
sect_len_incr
=
get_bits
(
gb
,
bits
);
sect_end
+=
sect_len_incr
;
sect_end
+=
sect_len_incr
;
if
(
get_bits_left
(
gb
)
<
0
)
{
if
(
get_bits_left
(
gb
)
<
0
)
{
av_log
(
ac
->
avctx
,
AV_LOG_ERROR
,
overread_err
);
av_log
(
ac
->
avctx
,
AV_LOG_ERROR
,
"decode_band_types: "
overread_err
);
return
-
1
;
return
-
1
;
}
}
if
(
sect_end
>
ics
->
max_sfb
)
{
if
(
sect_end
>
ics
->
max_sfb
)
{
...
@@ -2467,7 +2467,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
...
@@ -2467,7 +2467,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
if
(
elem_id
==
15
)
if
(
elem_id
==
15
)
elem_id
+=
get_bits
(
gb
,
8
)
-
1
;
elem_id
+=
get_bits
(
gb
,
8
)
-
1
;
if
(
get_bits_left
(
gb
)
<
8
*
elem_id
)
{
if
(
get_bits_left
(
gb
)
<
8
*
elem_id
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
overread_err
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"TYPE_FIL: "
overread_err
);
err
=
-
1
;
err
=
-
1
;
goto
fail
;
goto
fail
;
}
}
...
...
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