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

Don't attempt to deref OpenConn after it's been set to NULL. :)

Browse Source
This commit is contained in:
Jordan K. Hubbard 1997-10-03 14:00:09 +00:00
parent c5c1c13516
commit 7fd698d732
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/sysinstall/ftp.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: ftp.c,v 1.32 1997/02/22 14:11:42 peter Exp $
* $Id: ftp.c,v 1.33 1997/10/03 03:32:03 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -197,12 +197,14 @@ mediaGetFTP(Device *dev, char *file, Boolean probe)
try = file;
while ((fp = ftpGet(OpenConn, try, 0)) == NULL) {
int ftperr = ftpErrno(OpenConn);
/* If a hard fail, try to "bounce" the ftp server to clear it */
if (ftpErrno(OpenConn) != 550) {
dev->shutdown(dev);
if (ftpErrno(OpenConn) != 421) /* Timeout? */
if (ftperr != 550) {
if (ftperr != 421) /* Timeout? */
variable_unset(VAR_FTP_PATH);
/* If we can't re-initialize, just forget it */
dev->shutdown(dev);
if (!dev->init(dev)) {
netDown(dev);
fclose(OpenConn);

10
usr.sbin/sysinstall/ftp.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: ftp.c,v 1.32 1997/02/22 14:11:42 peter Exp $
* $Id: ftp.c,v 1.33 1997/10/03 03:32:03 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -197,12 +197,14 @@ mediaGetFTP(Device *dev, char *file, Boolean probe)
try = file;
while ((fp = ftpGet(OpenConn, try, 0)) == NULL) {
int ftperr = ftpErrno(OpenConn);
/* If a hard fail, try to "bounce" the ftp server to clear it */
if (ftpErrno(OpenConn) != 550) {
dev->shutdown(dev);
if (ftpErrno(OpenConn) != 421) /* Timeout? */
if (ftperr != 550) {
if (ftperr != 421) /* Timeout? */
variable_unset(VAR_FTP_PATH);
/* If we can't re-initialize, just forget it */
dev->shutdown(dev);
if (!dev->init(dev)) {
netDown(dev);
fclose(OpenConn);