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
8c4225ee
Commit
8c4225ee
authored
Jan 26, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
access_http: fix segfault due to unitialised bonjour variable.
(the bonjour part is now completely commented out)
parent
712a60c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
modules/access_output/http.c
modules/access_output/http.c
+6
-4
No files found.
modules/access_output/http.c
View file @
8c4225ee
/*****************************************************************************
/*****************************************************************************
* http.c
* http.c
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-200
5
the VideoLAN team
* Copyright (C) 2001-200
9
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
#include <vlc_input.h>
#include <vlc_input.h>
#include <vlc_playlist.h>
#include <vlc_playlist.h>
#ifdef HAVE_AVAHI_CLIENT
#if
0 //
def HAVE_AVAHI_CLIENT
#include "bonjour.h"
#include "bonjour.h"
#if defined( WIN32 )
#if defined( WIN32 )
...
@@ -114,8 +114,10 @@ vlc_module_begin ()
...
@@ -114,8 +114,10 @@ vlc_module_begin ()
CA_TEXT
,
CA_LONGTEXT
,
true
);
CA_TEXT
,
CA_LONGTEXT
,
true
);
add_string
(
SOUT_CFG_PREFIX
"crl"
,
NULL
,
NULL
,
add_string
(
SOUT_CFG_PREFIX
"crl"
,
NULL
,
NULL
,
CRL_TEXT
,
CRL_LONGTEXT
,
true
);
CRL_TEXT
,
CRL_LONGTEXT
,
true
);
#if 0 //def HAVE_AVAHI_CLIENT
add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL,
add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL,
BONJOUR_TEXT, BONJOUR_LONGTEXT, true);
BONJOUR_TEXT, BONJOUR_LONGTEXT, true);
#endif
set_callbacks
(
Open
,
Close
)
set_callbacks
(
Open
,
Close
)
vlc_module_end
()
vlc_module_end
()
...
@@ -145,7 +147,7 @@ struct sout_access_out_sys_t
...
@@ -145,7 +147,7 @@ struct sout_access_out_sys_t
uint8_t
*
p_header
;
uint8_t
*
p_header
;
bool
b_header_complete
;
bool
b_header_complete
;
#ifdef HAVE_AVAHI_CLIENT
#if
0 //
def HAVE_AVAHI_CLIENT
void *p_bonjour;
void *p_bonjour;
#endif
#endif
};
};
...
@@ -348,7 +350,7 @@ static void Close( vlc_object_t * p_this )
...
@@ -348,7 +350,7 @@ static void Close( vlc_object_t * p_this )
sout_access_out_t
*
p_access
=
(
sout_access_out_t
*
)
p_this
;
sout_access_out_t
*
p_access
=
(
sout_access_out_t
*
)
p_this
;
sout_access_out_sys_t
*
p_sys
=
p_access
->
p_sys
;
sout_access_out_sys_t
*
p_sys
=
p_access
->
p_sys
;
#ifdef HAVE_AVAHI_CLIENT
#if
0 //
def HAVE_AVAHI_CLIENT
if( p_sys->p_bonjour != NULL )
if( p_sys->p_bonjour != NULL )
bonjour_stop_service( p_sys->p_bonjour );
bonjour_stop_service( p_sys->p_bonjour );
#endif
#endif
...
...
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