Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
905bbb9e
Commit
905bbb9e
authored
Mar 02, 2008
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid a segfault when services_discovery_GetServicesNames fail.
parent
3f9cee77
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
0 deletions
+9
-0
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+3
-0
modules/gui/wxwidgets/dialogs/playlist.cpp
modules/gui/wxwidgets/dialogs/playlist.cpp
+3
-0
modules/misc/lua/sd.c
modules/misc/lua/sd.c
+3
-0
No files found.
modules/gui/qt4/menus.cpp
View file @
905bbb9e
...
@@ -428,6 +428,9 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
...
@@ -428,6 +428,9 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
char
**
ppsz_longnames
;
char
**
ppsz_longnames
;
char
**
ppsz_names
=
services_discovery_GetServicesNames
(
p_intf
,
char
**
ppsz_names
=
services_discovery_GetServicesNames
(
p_intf
,
&
ppsz_longnames
);
&
ppsz_longnames
);
if
(
!
ppsz_names
)
return
menu
;
char
**
ppsz_name
=
ppsz_names
,
**
ppsz_longname
=
ppsz_longnames
;
char
**
ppsz_name
=
ppsz_names
,
**
ppsz_longname
=
ppsz_longnames
;
for
(
;
*
ppsz_name
;
ppsz_name
++
,
ppsz_longname
++
)
for
(
;
*
ppsz_name
;
ppsz_name
++
,
ppsz_longname
++
)
{
{
...
...
modules/gui/wxwidgets/dialogs/playlist.cpp
View file @
905bbb9e
...
@@ -1408,6 +1408,9 @@ wxMenu *Playlist::SDMenu()
...
@@ -1408,6 +1408,9 @@ wxMenu *Playlist::SDMenu()
char
**
ppsz_longnames
;
char
**
ppsz_longnames
;
char
**
ppsz_names
=
services_discovery_GetServicesNames
(
p_playlist
,
char
**
ppsz_names
=
services_discovery_GetServicesNames
(
p_playlist
,
&
ppsz_longnames
);
&
ppsz_longnames
);
if
(
!
ppsz_names
)
return
p_sd_menu
;
char
**
ppsz_name
=
ppsz_names
,
**
ppsz_longname
=
ppsz_longnames
;
char
**
ppsz_name
=
ppsz_names
,
**
ppsz_longname
=
ppsz_longnames
;
int
i_number
=
0
;
int
i_number
=
0
;
...
...
modules/misc/lua/sd.c
View file @
905bbb9e
...
@@ -50,6 +50,9 @@ int vlclua_sd_get_services_names( lua_State *L )
...
@@ -50,6 +50,9 @@ int vlclua_sd_get_services_names( lua_State *L )
vlc_object_t
*
p_this
=
vlclua_get_this
(
L
);
vlc_object_t
*
p_this
=
vlclua_get_this
(
L
);
char
**
ppsz_longnames
;
char
**
ppsz_longnames
;
char
**
ppsz_names
=
services_discovery_GetServicesNames
(
p_this
,
&
ppsz_longnames
);
char
**
ppsz_names
=
services_discovery_GetServicesNames
(
p_this
,
&
ppsz_longnames
);
if
(
!
ppsz_names
)
return
0
;
char
**
ppsz_longname
=
ppsz_longnames
;
char
**
ppsz_longname
=
ppsz_longnames
;
char
**
ppsz_name
=
ppsz_names
;
char
**
ppsz_name
=
ppsz_names
;
lua_settop
(
L
,
0
);
lua_settop
(
L
,
0
);
...
...
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