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
4a6a29a7
Commit
4a6a29a7
authored
Sep 27, 2011
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libopencore-amr: check output buffer size before decoding
parent
345d15d2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
4 deletions
+16
-4
libopencore-amr.c
libavcodec/libopencore-amr.c
+16
-4
No files found.
libavcodec/libopencore-amr.c
View file @
4a6a29a7
...
@@ -131,11 +131,17 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -131,11 +131,17 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
AMRContext
*
s
=
avctx
->
priv_data
;
AMRContext
*
s
=
avctx
->
priv_data
;
static
const
uint8_t
block_size
[
16
]
=
{
12
,
13
,
15
,
17
,
19
,
20
,
26
,
31
,
5
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
static
const
uint8_t
block_size
[
16
]
=
{
12
,
13
,
15
,
17
,
19
,
20
,
26
,
31
,
5
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
enum
Mode
dec_mode
;
enum
Mode
dec_mode
;
int
packet_size
;
int
packet_size
,
out_size
;
av_dlog
(
avctx
,
"amr_decode_frame buf=%p buf_size=%d frame_count=%d!!
\n
"
,
av_dlog
(
avctx
,
"amr_decode_frame buf=%p buf_size=%d frame_count=%d!!
\n
"
,
buf
,
buf_size
,
avctx
->
frame_number
);
buf
,
buf_size
,
avctx
->
frame_number
);
out_size
=
160
*
av_get_bytes_per_sample
(
avctx
->
sample_fmt
);
if
(
*
data_size
<
out_size
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"output buffer is too small
\n
"
);
return
AVERROR
(
EINVAL
);
}
dec_mode
=
(
buf
[
0
]
>>
3
)
&
0x000F
;
dec_mode
=
(
buf
[
0
]
>>
3
)
&
0x000F
;
packet_size
=
block_size
[
dec_mode
]
+
1
;
packet_size
=
block_size
[
dec_mode
]
+
1
;
...
@@ -149,7 +155,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -149,7 +155,7 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,
packet_size
,
buf
[
0
],
buf
[
1
],
buf
[
2
],
buf
[
3
]);
packet_size
,
buf
[
0
],
buf
[
1
],
buf
[
2
],
buf
[
3
]);
/* call decoder */
/* call decoder */
Decoder_Interface_Decode
(
s
->
dec_state
,
buf
,
data
,
0
);
Decoder_Interface_Decode
(
s
->
dec_state
,
buf
,
data
,
0
);
*
data_size
=
160
*
2
;
*
data_size
=
out_size
;
return
packet_size
;
return
packet_size
;
}
}
...
@@ -271,9 +277,15 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -271,9 +277,15 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,
int
buf_size
=
avpkt
->
size
;
int
buf_size
=
avpkt
->
size
;
AMRWBContext
*
s
=
avctx
->
priv_data
;
AMRWBContext
*
s
=
avctx
->
priv_data
;
int
mode
;
int
mode
;
int
packet_size
;
int
packet_size
,
out_size
;
static
const
uint8_t
block_size
[
16
]
=
{
18
,
24
,
33
,
37
,
41
,
47
,
51
,
59
,
61
,
6
,
6
,
0
,
0
,
0
,
1
,
1
};
static
const
uint8_t
block_size
[
16
]
=
{
18
,
24
,
33
,
37
,
41
,
47
,
51
,
59
,
61
,
6
,
6
,
0
,
0
,
0
,
1
,
1
};
out_size
=
320
*
av_get_bytes_per_sample
(
avctx
->
sample_fmt
);
if
(
*
data_size
<
out_size
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"output buffer is too small
\n
"
);
return
AVERROR
(
EINVAL
);
}
mode
=
(
buf
[
0
]
>>
3
)
&
0x000F
;
mode
=
(
buf
[
0
]
>>
3
)
&
0x000F
;
packet_size
=
block_size
[
mode
];
packet_size
=
block_size
[
mode
];
...
@@ -284,7 +296,7 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -284,7 +296,7 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,
}
}
D_IF_decode
(
s
->
state
,
buf
,
data
,
_good_frame
);
D_IF_decode
(
s
->
state
,
buf
,
data
,
_good_frame
);
*
data_size
=
320
*
2
;
*
data_size
=
out_size
;
return
packet_size
;
return
packet_size
;
}
}
...
...
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