aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Hoersken <info@marc-hoersken.de>2014-04-19 16:00:43 +0200
committerMarc Hoersken <info@marc-hoersken.de>2014-04-19 16:00:43 +0200
commit549b4a659a7ffabe499369869abf05762a4c0287 (patch)
tree7725c6267ab760973b35112aad76ed9a983e151e
parent9146f379731e974af1a387c81f6859a072504d68 (diff)
netrc.c: fix multiple possible dereferences of null pointers
-rw-r--r--lib/netrc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/netrc.c b/lib/netrc.c
index a092314c7..a1b00b2d6 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -61,7 +61,7 @@ int Curl_parsenetrc(const char *host,
{
FILE *file;
int retcode=1;
- int specific_login = (**loginp != 0);
+ int specific_login = (*loginp && **loginp != 0);
bool netrc_alloc = FALSE;
enum host_lookup_state state=NOTHING;
@@ -113,7 +113,7 @@ int Curl_parsenetrc(const char *host,
tok=strtok_r(netrcbuffer, " \t\n", &tok_buf);
while(!done && tok) {
- if(**loginp && **passwordp) {
+ if((*loginp && **loginp) && (*passwordp && **passwordp)) {
done=TRUE;
break;
}