d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repeat after me, "check to see that a pointer isn't NULL before

Browse Source 
dereferenceing it".  This fixes ``pkg_add -r''.
This commit is contained in:
David E. O'Brien 2000-10-28 20:27:11 +00:00
parent 5bc2a29c8c
commit f03bce74fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libfetch/ftp.c
View File

@ -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;