From a90e794625f844c7a6a29f8223943143bac3a03d Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 28 Oct 2000 20:27:11 +0000 Subject: Repeat after me, "check to see that a pointer isn't NULL before dereferenceing it". This fixes ``pkg_add -r''. --- lib/libfetch/ftp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/libfetch') diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index 00b1cf5..ec74ba2 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -887,7 +887,7 @@ fetchXGetFTP(struct url *url, struct url_stat *us, char *flags) int cd; /* get the proxy URL, and check if we should use HTTP instead */ - if (!strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) { + if (flags && !strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) { if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0) return _http_request(url, "GET", us, purl, flags); } else { @@ -934,7 +934,7 @@ fetchPutFTP(struct url *url, char *flags) int cd; /* get the proxy URL, and check if we should use HTTP instead */ - if (!strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) { + if (flags && !strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) { if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0) /* XXX HTTP PUT is not implemented, so try without the proxy */ purl = NULL; @@ -968,7 +968,7 @@ fetchStatFTP(struct url *url, struct url_stat *us, char *flags) int cd; /* get the proxy URL, and check if we should use HTTP instead */ - if (!strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) { + if (flags && !strchr(flags, 'd') && (purl = _ftp_get_proxy()) != NULL) { if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0) { FILE *f; -- cgit v1.1