From: Rasmus Lerdorf <rasmus@php.net>
Date: Tue, 24 Nov 2009 13:57:39 +0000 (+0000)
Subject: Fix null deref found by Michael Maclean
X-Git-Tag: php-5.2.12RC2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bee460734548c9cb714ea967b7f0960651f57b55;p=php

Fix null deref found by Michael Maclean
---

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 9631334655..d4fd8b62e2 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -1699,7 +1699,7 @@ ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t typ
 	char			arg[11];
 
 	if (ftp == NULL) {
-		goto bail;
+		return PHP_FTP_FAILED;
 	}
 
 	if (!ftp_type(ftp, type)) {