Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
172e22c2
Commit
172e22c2
authored
Jun 21, 2008
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unneeded msg_Error.
Fix a potential segfault.
parent
42bb2362
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
4 additions
and
48 deletions
+4
-48
modules/access/smb.c
modules/access/smb.c
+0
-1
modules/access_output/bonjour.c
modules/access_output/bonjour.c
+0
-12
modules/access_output/http.c
modules/access_output/http.c
+0
-3
modules/access_output/shout.c
modules/access_output/shout.c
+2
-1
modules/demux/nsc.c
modules/demux/nsc.c
+0
-4
modules/demux/ts.c
modules/demux/ts.c
+0
-1
modules/misc/svg.c
modules/misc/svg.c
+0
-12
modules/misc/win32text.c
modules/misc/win32text.c
+0
-3
modules/packetizer/mpeg4audio.c
modules/packetizer/mpeg4audio.c
+1
-4
modules/packetizer/mpeg4video.c
modules/packetizer/mpeg4video.c
+1
-4
modules/video_output/msw/events.c
modules/video_output/msw/events.c
+0
-3
No files found.
modules/access/smb.c
View file @
172e22c2
...
@@ -216,7 +216,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -216,7 +216,6 @@ static int Open( vlc_object_t *p_this )
#ifdef USE_CTX
#ifdef USE_CTX
if
(
!
(
p_smb
=
smbc_new_context
())
)
if
(
!
(
p_smb
=
smbc_new_context
())
)
{
{
msg_Err
(
p_access
,
"out of memory"
);
free
(
psz_uri
);
free
(
psz_uri
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
...
modules/access_output/bonjour.c
View file @
172e22c2
...
@@ -201,10 +201,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
...
@@ -201,10 +201,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
p_sys
=
(
bonjour_t
*
)
malloc
(
sizeof
(
*
p_sys
)
);
p_sys
=
(
bonjour_t
*
)
malloc
(
sizeof
(
*
p_sys
)
);
if
(
p_sys
==
NULL
)
if
(
p_sys
==
NULL
)
{
msg_Err
(
p_log
,
"out of memory"
);
return
NULL
;
return
NULL
;
}
memset
(
p_sys
,
0
,
sizeof
(
*
p_sys
)
);
memset
(
p_sys
,
0
,
sizeof
(
*
p_sys
)
);
...
@@ -214,20 +211,14 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
...
@@ -214,20 +211,14 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
p_sys
->
psz_name
=
avahi_strdup
(
psz_name
);
p_sys
->
psz_name
=
avahi_strdup
(
psz_name
);
p_sys
->
psz_stype
=
avahi_strdup
(
psz_stype
);
p_sys
->
psz_stype
=
avahi_strdup
(
psz_stype
);
if
(
p_sys
->
psz_name
==
NULL
||
p_sys
->
psz_stype
==
NULL
)
if
(
p_sys
->
psz_name
==
NULL
||
p_sys
->
psz_stype
==
NULL
)
{
msg_Err
(
p_sys
->
p_log
,
"out of memory"
);
goto
error
;
goto
error
;
}
if
(
psz_txt
!=
NULL
)
if
(
psz_txt
!=
NULL
)
{
{
p_sys
->
psz_txt
=
avahi_strdup
(
psz_txt
);
p_sys
->
psz_txt
=
avahi_strdup
(
psz_txt
);
if
(
p_sys
->
psz_txt
==
NULL
)
if
(
p_sys
->
psz_txt
==
NULL
)
{
msg_Err
(
p_sys
->
p_log
,
"out of memory"
);
goto
error
;
goto
error
;
}
}
}
p_sys
->
simple_poll
=
avahi_simple_poll_new
();
p_sys
->
simple_poll
=
avahi_simple_poll_new
();
if
(
p_sys
->
simple_poll
==
NULL
)
if
(
p_sys
->
simple_poll
==
NULL
)
...
@@ -251,10 +242,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
...
@@ -251,10 +242,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
p_sys
->
poll_thread
=
vlc_object_create
(
p_sys
->
p_log
,
p_sys
->
poll_thread
=
vlc_object_create
(
p_sys
->
p_log
,
sizeof
(
poll_thread_t
)
);
sizeof
(
poll_thread_t
)
);
if
(
p_sys
->
poll_thread
==
NULL
)
if
(
p_sys
->
poll_thread
==
NULL
)
{
msg_Err
(
p_sys
->
p_log
,
"out of memory"
);
goto
error
;
goto
error
;
}
p_sys
->
poll_thread
->
simple_poll
=
p_sys
->
simple_poll
;
p_sys
->
poll_thread
->
simple_poll
=
p_sys
->
simple_poll
;
if
(
vlc_thread_create
(
p_sys
->
poll_thread
,
"Avahi Poll Iterate Thread"
,
if
(
vlc_thread_create
(
p_sys
->
poll_thread
,
"Avahi Poll Iterate Thread"
,
...
...
modules/access_output/http.c
View file @
172e22c2
...
@@ -171,10 +171,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -171,10 +171,7 @@ static int Open( vlc_object_t *p_this )
if
(
!
(
p_sys
=
p_access
->
p_sys
=
if
(
!
(
p_sys
=
p_access
->
p_sys
=
malloc
(
sizeof
(
sout_access_out_sys_t
)
)
)
)
malloc
(
sizeof
(
sout_access_out_sys_t
)
)
)
)
{
msg_Err
(
p_access
,
"Not enough memory"
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
config_ChainParse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
config_ChainParse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
...
...
modules/access_output/shout.c
View file @
172e22c2
...
@@ -184,6 +184,8 @@ static int Open( vlc_object_t *p_this )
...
@@ -184,6 +184,8 @@ static int Open( vlc_object_t *p_this )
config_ChainParse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
config_ChainParse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
psz_accessname
=
psz_parser
=
strdup
(
p_access
->
psz_path
);
psz_accessname
=
psz_parser
=
strdup
(
p_access
->
psz_path
);
if
(
!
psz_parser
)
return
VLC_ENOMEM
;
if
(
!
p_access
->
psz_path
)
if
(
!
p_access
->
psz_path
)
{
{
...
@@ -212,7 +214,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -212,7 +214,6 @@ static int Open( vlc_object_t *p_this )
p_sys
=
p_access
->
p_sys
=
malloc
(
sizeof
(
sout_access_out_sys_t
)
);
p_sys
=
p_access
->
p_sys
=
malloc
(
sizeof
(
sout_access_out_sys_t
)
);
if
(
!
p_sys
)
if
(
!
p_sys
)
{
{
msg_Err
(
p_access
,
"out of memory"
);
free
(
psz_accessname
);
free
(
psz_accessname
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
...
modules/demux/nsc.c
View file @
172e22c2
...
@@ -213,10 +213,7 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
...
@@ -213,10 +213,7 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf16_size
=
length
;
buf16_size
=
length
;
buf16
=
malloc
(
buf16_size
);
buf16
=
malloc
(
buf16_size
);
if
(
buf16
==
NULL
)
if
(
buf16
==
NULL
)
{
msg_Err
(
p_demux
,
"out of memory"
);
return
NULL
;
return
NULL
;
}
for
(
i
=
0
;
i
<
length
;
i
++
)
for
(
i
=
0
;
i
<
length
;
i
++
)
{
{
...
@@ -232,7 +229,6 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
...
@@ -232,7 +229,6 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf8
=
malloc
(
buf8_size
+
1
);
buf8
=
malloc
(
buf8_size
+
1
);
if
(
buf8
==
NULL
)
if
(
buf8
==
NULL
)
{
{
msg_Err
(
p_demux
,
"out of memory"
);
free
(
buf16
);
free
(
buf16
);
return
NULL
;
return
NULL
;
}
}
...
...
modules/demux/ts.c
View file @
172e22c2
...
@@ -728,7 +728,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -728,7 +728,6 @@ static int Open( vlc_object_t *p_this )
prg
=
malloc
(
sizeof
(
ts_prg_psi_t
)
);
prg
=
malloc
(
sizeof
(
ts_prg_psi_t
)
);
if
(
!
prg
)
if
(
!
prg
)
{
{
msg_Err
(
p_demux
,
"out of memory"
);
Close
(
VLC_OBJECT
(
p_demux
)
);
Close
(
VLC_OBJECT
(
p_demux
)
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
...
modules/misc/svg.c
View file @
172e22c2
...
@@ -131,16 +131,12 @@ static int Create( vlc_object_t *p_this )
...
@@ -131,16 +131,12 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
/* Allocate structure */
p_sys
=
malloc
(
sizeof
(
filter_sys_t
)
);
p_sys
=
malloc
(
sizeof
(
filter_sys_t
)
);
if
(
!
p_sys
)
if
(
!
p_sys
)
{
msg_Err
(
p_filter
,
"out of memory"
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
/* Initialize psz_template */
/* Initialize psz_template */
p_sys
->
psz_template
=
svg_GetTemplate
(
p_this
);
p_sys
->
psz_template
=
svg_GetTemplate
(
p_this
);
if
(
!
p_sys
->
psz_template
)
if
(
!
p_sys
->
psz_template
)
{
{
msg_Err
(
p_filter
,
"out of memory"
);
free
(
p_sys
);
free
(
p_sys
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
@@ -204,10 +200,7 @@ static char *svg_GetTemplate( vlc_object_t *p_this )
...
@@ -204,10 +200,7 @@ static char *svg_GetTemplate( vlc_object_t *p_this )
psz_template
=
malloc
(
(
s
.
st_size
+
42
)
*
sizeof
(
char
)
);
psz_template
=
malloc
(
(
s
.
st_size
+
42
)
*
sizeof
(
char
)
);
if
(
!
psz_template
)
if
(
!
psz_template
)
{
msg_Err
(
p_filter
,
"out of memory"
);
return
NULL
;
return
NULL
;
}
memset
(
psz_template
,
0
,
s
.
st_size
+
1
);
memset
(
psz_template
,
0
,
s
.
st_size
+
1
);
fread
(
psz_template
,
s
.
st_size
,
1
,
file
);
fread
(
psz_template
,
s
.
st_size
,
1
,
file
);
fclose
(
file
);
fclose
(
file
);
...
@@ -451,10 +444,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
...
@@ -451,10 +444,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
p_svg
=
(
svg_rendition_t
*
)
malloc
(
sizeof
(
svg_rendition_t
)
);
p_svg
=
(
svg_rendition_t
*
)
malloc
(
sizeof
(
svg_rendition_t
)
);
if
(
!
p_svg
)
if
(
!
p_svg
)
{
msg_Err
(
p_filter
,
"out of memory"
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
p_region_out
->
i_x
=
p_region_in
->
i_x
;
p_region_out
->
i_x
=
p_region_in
->
i_x
;
p_region_out
->
i_y
=
p_region_in
->
i_y
;
p_region_out
->
i_y
=
p_region_in
->
i_y
;
...
@@ -467,7 +457,6 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
...
@@ -467,7 +457,6 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
p_svg
->
psz_text
=
strdup
(
psz_string
);
p_svg
->
psz_text
=
strdup
(
psz_string
);
if
(
!
p_svg
->
psz_text
)
if
(
!
p_svg
->
psz_text
)
{
{
msg_Err
(
p_filter
,
"out of memory"
);
free
(
p_svg
);
free
(
p_svg
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
@@ -482,7 +471,6 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
...
@@ -482,7 +471,6 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
p_svg
->
psz_text
=
malloc
(
(
length
+
1
)
*
sizeof
(
char
)
);
p_svg
->
psz_text
=
malloc
(
(
length
+
1
)
*
sizeof
(
char
)
);
if
(
!
p_svg
->
psz_text
)
if
(
!
p_svg
->
psz_text
)
{
{
msg_Err
(
p_filter
,
"out of memory"
);
free
(
p_svg
);
free
(
p_svg
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
...
...
modules/misc/win32text.c
View file @
172e22c2
...
@@ -151,10 +151,7 @@ static int Create( vlc_object_t *p_this )
...
@@ -151,10 +151,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
/* Allocate structure */
p_filter
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
filter_sys_t
)
);
p_filter
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
filter_sys_t
)
);
if
(
!
p_sys
)
if
(
!
p_sys
)
{
msg_Err
(
p_filter
,
"out of memory"
);
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
p_sys
->
i_font_size
=
0
;
p_sys
->
i_font_size
=
0
;
p_sys
->
i_display_height
=
0
;
p_sys
->
i_display_height
=
0
;
...
...
modules/packetizer/mpeg4audio.c
View file @
172e22c2
...
@@ -203,10 +203,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
...
@@ -203,10 +203,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
/* Allocate the memory needed to store the decoder's structure */
/* Allocate the memory needed to store the decoder's structure */
if
(
(
p_dec
->
p_sys
=
p_sys
=
if
(
(
p_dec
->
p_sys
=
p_sys
=
(
decoder_sys_t
*
)
malloc
(
sizeof
(
decoder_sys_t
))
)
==
NULL
)
(
decoder_sys_t
*
)
malloc
(
sizeof
(
decoder_sys_t
))
)
==
NULL
)
{
return
VLC_ENOMEM
;
msg_Err
(
p_dec
,
"out of memory"
);
return
VLC_EGENERIC
;
}
/* Misc init */
/* Misc init */
p_sys
->
i_state
=
STATE_NOSYNC
;
p_sys
->
i_state
=
STATE_NOSYNC
;
...
...
modules/packetizer/mpeg4video.c
View file @
172e22c2
...
@@ -160,10 +160,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -160,10 +160,7 @@ static int Open( vlc_object_t *p_this )
/* Allocate the memory needed to store the decoder's structure */
/* Allocate the memory needed to store the decoder's structure */
if
(
(
p_dec
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
decoder_sys_t
)
)
)
==
NULL
)
if
(
(
p_dec
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
decoder_sys_t
)
)
)
==
NULL
)
{
return
VLC_ENOMEM
;
msg_Err
(
p_dec
,
"out of memory"
);
return
VLC_EGENERIC
;
}
memset
(
p_sys
,
0
,
sizeof
(
decoder_sys_t
)
);
memset
(
p_sys
,
0
,
sizeof
(
decoder_sys_t
)
);
/* Misc init */
/* Misc init */
...
...
modules/video_output/msw/events.c
View file @
172e22c2
...
@@ -113,10 +113,7 @@ void EventThread( event_thread_t *p_event )
...
@@ -113,10 +113,7 @@ void EventThread( event_thread_t *p_event )
/* Creating a window under Windows also initializes the thread's event
/* Creating a window under Windows also initializes the thread's event
* message queue */
* message queue */
if
(
DirectXCreateWindow
(
p_event
->
p_vout
)
)
if
(
DirectXCreateWindow
(
p_event
->
p_vout
)
)
{
msg_Err
(
p_event
,
"out of memory"
);
p_event
->
b_dead
=
true
;
p_event
->
b_dead
=
true
;
}
/* Signal the creation of the window */
/* Signal the creation of the window */
vlc_thread_ready
(
p_event
);
vlc_thread_ready
(
p_event
);
...
...
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