git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aa65f6c
)
http: avoid NULL dereference
author
Rémi Denis-Courmont
<remi@remlab.net>
Wed, 23 Apr 2014 20:59:10 +0000
(23:59 +0300)
committer
Rémi Denis-Courmont
<remi@remlab.net>
Wed, 23 Apr 2014 20:59:10 +0000
(23:59 +0300)
modules/access/http.c
patch
|
blob
|
history
diff --git
a/modules/access/http.c
b/modules/access/http.c
index
67431cf
..
22f752d
100644
(file)
--- a/
modules/access/http.c
+++ b/
modules/access/http.c
@@
-1216,11
+1216,11
@@
static int Request( access_t *p_access, uint64_t i_tell )
}
/* Authentication */
}
/* Authentication */
- if( p_sys->url.psz_username
||
p_sys->url.psz_password )
+ if( p_sys->url.psz_username
&&
p_sys->url.psz_password )
AuthReply( p_access, "", &p_sys->url, &p_sys->auth );
/* Proxy Authentication */
AuthReply( p_access, "", &p_sys->url, &p_sys->auth );
/* Proxy Authentication */
- if( p_sys->proxy.psz_username
||
p_sys->proxy.psz_password )
+ if( p_sys->proxy.psz_username
&&
p_sys->proxy.psz_password )
AuthReply( p_access, "Proxy-", &p_sys->proxy, &p_sys->proxy_auth );
/* ICY meta data request */
AuthReply( p_access, "Proxy-", &p_sys->proxy, &p_sys->proxy_auth );
/* ICY meta data request */