From a075b38adea73ff1578984b263eed92a9237d4d2 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Fri, 28 Jan 2011 08:20:37 -0800 Subject: [PATCH 1/2] netrc: Tightened up the type checks. The state should not be anonymous so that we can check if the values are fine. Added 2 unreachables states to the switch as a result of this change. --- lib/netrc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/netrc.c b/lib/netrc.c index e944325..1934d6a 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -58,7 +58,7 @@ /* Get user and password from .netrc when given a machine name */ -enum { +enum host_lookup_state { NOTHING, HOSTFOUND, /* the 'machine' keyword was found */ HOSTCOMPLETE, /* the machine name following the keyword was found too */ @@ -83,7 +83,7 @@ int Curl_parsenetrc(const char *host, char *home = NULL; bool home_alloc = FALSE; bool netrc_alloc = FALSE; - int state=NOTHING; + enum host_lookup_state state=NOTHING; char state_login=0; /* Found a login keyword */ char state_password=0; /* Found a password keyword */ @@ -210,6 +210,10 @@ int Curl_parsenetrc(const char *host, state_our_login = FALSE; } break; + case HOSTCOMPLETE: + case HOSTEND: + /* Should not be reached. */ + DEBUGASSERT(0); } /* switch (state) */ tok = strtok_r(NULL, " \t\n", &tok_buf); -- 1.7.1