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
69467fb6
Commit
69467fb6
authored
May 02, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wav: return meaningful errors
parent
a5f88736
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
wavdec.c
libavformat/wavdec.c
+9
-9
No files found.
libavformat/wavdec.c
View file @
69467fb6
...
...
@@ -219,18 +219,18 @@ static int wav_read_header(AVFormatContext *s)
rf64
=
tag
==
MKTAG
(
'R'
,
'F'
,
'6'
,
'4'
);
if
(
!
rf64
&&
tag
!=
MKTAG
(
'R'
,
'I'
,
'F'
,
'F'
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
avio_rl32
(
pb
);
/* file size */
tag
=
avio_rl32
(
pb
);
if
(
tag
!=
MKTAG
(
'W'
,
'A'
,
'V'
,
'E'
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
rf64
)
{
if
(
avio_rl32
(
pb
)
!=
MKTAG
(
'd'
,
's'
,
'6'
,
'4'
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
size
=
avio_rl32
(
pb
);
if
(
size
<
16
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
avio_rl64
(
pb
);
/* RIFF size */
data_size
=
avio_rl64
(
pb
);
...
...
@@ -467,22 +467,22 @@ static int w64_read_header(AVFormatContext *s)
avio_read
(
pb
,
guid
,
16
);
if
(
memcmp
(
guid
,
guid_riff
,
16
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
/* riff + wave + fmt + sizes */
if
(
avio_rl64
(
pb
)
<
16
+
8
+
16
+
8
+
16
+
8
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
avio_read
(
pb
,
guid
,
16
);
if
(
memcmp
(
guid
,
guid_wave
,
16
))
{
av_log
(
s
,
AV_LOG_ERROR
,
"could not find wave guid
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
size
=
find_guid
(
pb
,
guid_fmt
);
if
(
size
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"could not find fmt guid
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
st
=
avformat_new_stream
(
s
,
NULL
);
...
...
@@ -502,7 +502,7 @@ static int w64_read_header(AVFormatContext *s)
size
=
find_guid
(
pb
,
guid_data
);
if
(
size
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"could not find data guid
\n
"
);
return
-
1
;
return
AVERROR_INVALIDDATA
;
}
wav
->
data_end
=
avio_tell
(
pb
)
+
size
-
24
;
wav
->
w64
=
1
;
...
...
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