diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2012-01-26 16:39:53 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2012-01-26 16:39:53 +0100 |
| commit | 8ee2576b6fcc8aee0c768255a55e255a1868b609 (patch) | |
| tree | 41dbe761ce20a76f3168257800bba199ed77ec47 /lib/telnet.c | |
| parent | 575f3c30ed60aafddbaeeb26745cca942fb9ee2f (diff) | |
| parent | cf9fb08ca4537d76afde44daf1e92307fe2882d3 (diff) | |
Merge branch 'master' of github.com:bagder/curl
Diffstat (limited to 'lib/telnet.c')
| -rw-r--r-- | lib/telnet.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/telnet.c b/lib/telnet.c index e7cb295d8..0be795435 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, 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 @@ -1273,11 +1273,13 @@ static CURLcode telnet_done(struct connectdata *conn, (void)status; /* unused */ (void)premature; /* not used */ + if(!tn) + return CURLE_OK; + curl_slist_free_all(tn->telnet_vars); tn->telnet_vars = NULL; - free(conn->data->state.proto.telnet); - conn->data->state.proto.telnet = NULL; + Curl_safefree(conn->data->state.proto.telnet); return CURLE_OK; } |