Commit 0305cdac authored by ivoire's avatar ivoire

Revert some errors in 85943656 and...

Revert some errors in 85943656 and 9630c00c
parent 6d9e92da
......@@ -188,11 +188,11 @@ static int Open( vlc_object_t *p_this )
* smb://[[[domain;]user[:password@]]server[/share[/path[/file]]]] */
if( !psz_user ) psz_user = var_CreateGetString( p_access, "smb-user" );
if( !*psz_user ) { free( psz_user ); psz_user = 0; }
if( psz_user && !*psz_user ) { free( psz_user ); psz_user = 0; }
if( !psz_pwd ) psz_pwd = var_CreateGetString( p_access, "smb-pwd" );
if( !*psz_pwd ) { free( psz_pwd ); psz_pwd = 0; }
if(!psz_domain) psz_domain = var_CreateGetString( p_access, "smb-domain" );
if( !*psz_domain ) { free( psz_domain ); psz_domain = 0; }
if( psz_pwd && !*psz_pwd ) { free( psz_pwd ); psz_pwd = 0; }
if( !psz_domain ) psz_domain = var_CreateGetString( p_access, "smb-domain" );
if( psz_domain && !*psz_domain ) { free( psz_domain ); psz_domain = 0; }
#ifdef WIN32
if( psz_user )
......
......@@ -177,12 +177,12 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
var_Get( p_vout, "vout-filter", &val );
psz_filter_chain = val.psz_string;
if( !*psz_filter_chain )
if( psz_filter_chain && !*psz_filter_chain )
{
free( psz_filter_chain );
psz_filter_chain = NULL;
}
if( !*p_vout->psz_filter_chain )
if( p_vout->psz_filter_chain && !*p_vout->psz_filter_chain )
{
free( p_vout->psz_filter_chain );
p_vout->psz_filter_chain = NULL;
......
......@@ -481,7 +481,7 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
memset( &fmt_out, 0, sizeof(video_format_t) );
var_Get( p_vout, "snapshot-path", &val );
if( !*val.psz_string )
if( val.psz_string && !*val.psz_string )
{
free( val.psz_string );
val.psz_string = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment