From: Steinar Gunderson <sgunderson@bigfoot.com>
Date: Sun, 26 Sep 2010 16:21:55 +0000 (+0200)
Subject: Merge branch 'master' of git://git.videolan.org/vlc
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b93670e1dce5ba4bebc66db8d78864d865672b68;hp=55b7b5bdb7e65e94465d4ff5660cfc2964d7a18f;p=vlc

Merge branch 'master' of git://git.videolan.org/vlc
---

diff --git a/modules/misc/lua/demux.c b/modules/misc/lua/demux.c
index 3fe1ef72eb..f924512a3d 100644
--- a/modules/misc/lua/demux.c
+++ b/modules/misc/lua/demux.c
@@ -209,13 +209,9 @@ int Import_LuaPlaylist( vlc_object_t *p_this )
     demux_t *p_demux = (demux_t *)p_this;
     int ret;
 
-    p_demux->p_sys = (demux_sys_t*)malloc( sizeof( demux_sys_t ) );
+    p_demux->p_sys = calloc( 1, sizeof( demux_sys_t ) );
     if( !p_demux->p_sys )
-    {
         return VLC_ENOMEM;
-    }
-
-    p_demux->p_sys->psz_filename = NULL;
 
     p_demux->pf_control = Control;
     p_demux->pf_demux = Demux;
diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c
index 7fa4ca2fc2..498f50c964 100644
--- a/modules/misc/lua/extension.c
+++ b/modules/misc/lua/extension.c
@@ -342,61 +342,31 @@ int ScanLuaCallback( vlc_object_t *p_this, const char *psz_script,
             /* Get author */
             lua_getfield( L, -1, "author" );
             if( lua_isstring( L, -1 ) )
-            {
-                p_ext->psz_author = strdup( luaL_checkstring( L, -1 ) );
-            }
-            else
-            {
-                p_ext->psz_author = NULL;
-            }
+                p_ext->psz_author = strdup( luaL_optstring( L, -1, NULL ) );
             lua_pop( L, 1 );
 
             /* Get description */
             lua_getfield( L, -1, "description" );
             if( lua_isstring( L, -1 ) )
-            {
-                p_ext->psz_description = strdup( luaL_checkstring( L, -1 ) );
-            }
-            else
-            {
-                p_ext->psz_description = NULL;
-            }
+                p_ext->psz_description = strdup( luaL_optstring( L, -1, NULL ) );
             lua_pop( L, 1 );
 
             /* Get short description */
             lua_getfield( L, -1, "shortdesc" );
             if( lua_isstring( L, -1 ) )
-            {
-                p_ext->psz_shortdescription = strdup( luaL_checkstring( L, -1 ) );
-            }
-            else
-            {
-                p_ext->psz_shortdescription = NULL;
-            }
+                p_ext->psz_shortdescription = strdup( luaL_optstring( L, -1, NULL ) );
             lua_pop( L, 1 );
 
             /* Get URL */
             lua_getfield( L, -1, "url" );
             if( lua_isstring( L, -1 ) )
-            {
-                p_ext->psz_url = strdup( luaL_checkstring( L, -1 ) );
-            }
-            else
-            {
-                p_ext->psz_url = NULL;
-            }
+                p_ext->psz_url = strdup( luaL_optstring( L, -1, NULL ) );
             lua_pop( L, 1 );
 
             /* Get version */
             lua_getfield( L, -1, "version" );
             if( lua_isstring( L, -1 ) )
-            {
-                p_ext->psz_version = strdup( luaL_checkstring( L, -1 ) );
-            }
-            else
-            {
-                p_ext->psz_version = NULL;
-            }
+                p_ext->psz_version = strdup( luaL_optstring( L, -1, NULL ) );
             lua_pop( L, 1 );
         }
         else
diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 40e03e8bd6..04a3b9e35a 100644
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -108,6 +108,7 @@ sap_handler_t *SAP_Create (vlc_object_t *p_announce)
     if (p_sap == NULL)
         return NULL;
 
+    vlc_object_attach( p_sap, p_announce );
     vlc_mutex_init (&p_sap->lock);
     p_sap->first = NULL;
     return p_sap;