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
8dca0877
Commit
8dca0877
authored
Aug 09, 2014
by
Nidhi Makhijani
Committed by
Diego Biurrun
Aug 10, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegts: Return proper error code on invalid input data
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
59cc0812
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
mpegtsenc.c
libavformat/mpegtsenc.c
+5
-5
No files found.
libavformat/mpegtsenc.c
View file @
8dca0877
...
@@ -165,7 +165,7 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id,
...
@@ -165,7 +165,7 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id,
tot_len
=
3
+
5
+
len
+
4
;
tot_len
=
3
+
5
+
len
+
4
;
/* check if not too big */
/* check if not too big */
if
(
tot_len
>
1024
)
if
(
tot_len
>
1024
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
q
=
section
;
q
=
section
;
*
q
++
=
tid
;
*
q
++
=
tid
;
...
@@ -1006,7 +1006,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
...
@@ -1006,7 +1006,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if
(
ts_st
->
first_pts_check
&&
pts
==
AV_NOPTS_VALUE
)
{
if
(
ts_st
->
first_pts_check
&&
pts
==
AV_NOPTS_VALUE
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"first pts value must set
\n
"
);
av_log
(
s
,
AV_LOG_ERROR
,
"first pts value must set
\n
"
);
return
AVERROR
(
EINVAL
)
;
return
AVERROR
_INVALIDDATA
;
}
}
ts_st
->
first_pts_check
=
0
;
ts_st
->
first_pts_check
=
0
;
...
@@ -1017,7 +1017,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
...
@@ -1017,7 +1017,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if
(
pkt
->
size
<
5
||
AV_RB32
(
pkt
->
data
)
!=
0x0000001
)
{
if
(
pkt
->
size
<
5
||
AV_RB32
(
pkt
->
data
)
!=
0x0000001
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"H.264 bitstream malformed, "
av_log
(
s
,
AV_LOG_ERROR
,
"H.264 bitstream malformed, "
"no startcode found, use -bsf h264_mp4toannexb
\n
"
);
"no startcode found, use -bsf h264_mp4toannexb
\n
"
);
return
AVERROR
(
EINVAL
)
;
return
AVERROR
_INVALIDDATA
;
}
}
do
{
do
{
...
@@ -1040,7 +1040,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
...
@@ -1040,7 +1040,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
}
else
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_AAC
)
{
}
else
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_AAC
)
{
if
(
pkt
->
size
<
2
)
{
if
(
pkt
->
size
<
2
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"AAC packet too short
\n
"
);
av_log
(
s
,
AV_LOG_ERROR
,
"AAC packet too short
\n
"
);
return
AVERROR
(
EINVAL
)
;
return
AVERROR
_INVALIDDATA
;
}
}
if
((
AV_RB16
(
pkt
->
data
)
&
0xfff0
)
!=
0xfff0
)
{
if
((
AV_RB16
(
pkt
->
data
)
&
0xfff0
)
!=
0xfff0
)
{
int
ret
;
int
ret
;
...
@@ -1049,7 +1049,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
...
@@ -1049,7 +1049,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if
(
!
ts_st
->
amux
)
{
if
(
!
ts_st
->
amux
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"AAC bitstream not in ADTS format "
av_log
(
s
,
AV_LOG_ERROR
,
"AAC bitstream not in ADTS format "
"and extradata missing
\n
"
);
"and extradata missing
\n
"
);
return
AVERROR
(
EINVAL
)
;
return
AVERROR
_INVALIDDATA
;
}
}
av_init_packet
(
&
pkt2
);
av_init_packet
(
&
pkt2
);
...
...
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