Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
f2a77200
Commit
f2a77200
authored
Apr 21, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed cmov error handling avoid a later NULL pointer use.
parent
66612701
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+6
-6
No files found.
modules/demux/mp4/libmp4.c
View file @
f2a77200
...
@@ -1973,25 +1973,25 @@ static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
...
@@ -1973,25 +1973,25 @@ static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
p_cmvd
->
data
.
p_cmvd
->
p_data
==
NULL
)
p_cmvd
->
data
.
p_cmvd
->
p_data
==
NULL
)
{
{
msg_Warn
(
p_stream
,
"read box:
\"
cmov
\"
incomplete"
);
msg_Warn
(
p_stream
,
"read box:
\"
cmov
\"
incomplete"
);
return
1
;
return
0
;
}
}
if
(
p_dcom
->
data
.
p_dcom
->
i_algorithm
!=
FOURCC_zlib
)
if
(
p_dcom
->
data
.
p_dcom
->
i_algorithm
!=
FOURCC_zlib
)
{
{
msg_Dbg
(
p_stream
,
"read box:
\"
cmov
\"
compression algorithm : %4.4s "
msg_Dbg
(
p_stream
,
"read box:
\"
cmov
\"
compression algorithm : %4.4s "
"not supported"
,
(
char
*
)
&
p_dcom
->
data
.
p_dcom
->
i_algorithm
);
"not supported"
,
(
char
*
)
&
p_dcom
->
data
.
p_dcom
->
i_algorithm
);
return
1
;
return
0
;
}
}
#ifndef HAVE_ZLIB_H
#ifndef HAVE_ZLIB_H
msg_Dbg
(
p_stream
,
"read box:
\"
cmov
\"
zlib unsupported"
);
msg_Dbg
(
p_stream
,
"read box:
\"
cmov
\"
zlib unsupported"
);
return
1
;
return
0
;
#else
#else
/* decompress data */
/* decompress data */
/* allocate a new buffer */
/* allocate a new buffer */
if
(
!
(
p_data
=
malloc
(
p_cmvd
->
data
.
p_cmvd
->
i_uncompressed_size
)
)
)
if
(
!
(
p_data
=
malloc
(
p_cmvd
->
data
.
p_cmvd
->
i_uncompressed_size
)
)
)
return
1
;
return
0
;
/* init default structures */
/* init default structures */
z_data
.
next_in
=
p_cmvd
->
data
.
p_cmvd
->
p_data
;
z_data
.
next_in
=
p_cmvd
->
data
.
p_cmvd
->
p_data
;
z_data
.
avail_in
=
p_cmvd
->
data
.
p_cmvd
->
i_compressed_size
;
z_data
.
avail_in
=
p_cmvd
->
data
.
p_cmvd
->
i_compressed_size
;
...
@@ -2006,7 +2006,7 @@ static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
...
@@ -2006,7 +2006,7 @@ static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
{
{
msg_Err
(
p_stream
,
"read box:
\"
cmov
\"
error while uncompressing"
);
msg_Err
(
p_stream
,
"read box:
\"
cmov
\"
error while uncompressing"
);
free
(
p_data
);
free
(
p_data
);
return
1
;
return
0
;
}
}
/* uncompress */
/* uncompress */
...
@@ -2015,7 +2015,7 @@ static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
...
@@ -2015,7 +2015,7 @@ static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
{
{
msg_Err
(
p_stream
,
"read box:
\"
cmov
\"
error while uncompressing"
);
msg_Err
(
p_stream
,
"read box:
\"
cmov
\"
error while uncompressing"
);
free
(
p_data
);
free
(
p_data
);
return
1
;
return
0
;
}
}
if
(
p_cmvd
->
data
.
p_cmvd
->
i_uncompressed_size
!=
z_data
.
total_out
)
if
(
p_cmvd
->
data
.
p_cmvd
->
i_uncompressed_size
!=
z_data
.
total_out
)
...
...
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