svn: /php/php-src/ branches/PHP_5_2/ext/ftp/ftp.c branches/PHP_5_3/ext/ftp/ftp.c trunk/ext/ftp/ftp.c
| From: | Rasmus Lerdorf | Date: | Tue, 24 Nov 2009 13:57:39 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/ext/ftp/ftp.c branches/PHP_5_3/ext/ftp/ftp.c trunk/ext/ftp/ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60997@lists.php.net to get a copy of this message | ||
rasmus Tue, 24 Nov 2009 13:57:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291264
Log:
Fix null deref found by Michael Maclean
Changed paths:
U php/php-src/branches/PHP_5_2/ext/ftp/ftp.c
U php/php-src/branches/PHP_5_3/ext/ftp/ftp.c
U php/php-src/trunk/ext/ftp/ftp.c
Modified: php/php-src/branches/PHP_5_2/ext/ftp/ftp.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/ftp/ftp.c 2009-11-24 13:51:53 UTC (rev 291263)
+++ php/php-src/branches/PHP_5_2/ext/ftp/ftp.c 2009-11-24 13:57:39 UTC (rev 291264)
@@ -1699,7 +1699,7 @@
char arg[11];
if (ftp == NULL) {
- goto bail;
+ return PHP_FTP_FAILED;
}
if (!ftp_type(ftp, type)) {
Modified: php/php-src/branches/PHP_5_3/ext/ftp/ftp.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/ftp/ftp.c 2009-11-24 13:51:53 UTC (rev 291263)
+++ php/php-src/branches/PHP_5_3/ext/ftp/ftp.c 2009-11-24 13:57:39 UTC (rev 291264)
@@ -1699,7 +1699,7 @@
char arg[11];
if (ftp == NULL) {
- goto bail;
+ return PHP_FTP_FAILED;
}
if (!ftp_type(ftp, type)) {
Modified: php/php-src/trunk/ext/ftp/ftp.c
===================================================================
--- php/php-src/trunk/ext/ftp/ftp.c 2009-11-24 13:51:53 UTC (rev 291263)
+++ php/php-src/trunk/ext/ftp/ftp.c 2009-11-24 13:57:39 UTC (rev 291264)
@@ -1700,7 +1700,7 @@
char arg[11];
if (ftp == NULL) {
- goto bail;
+ return PHP_FTP_FAILED;
}
if (!ftp_type(ftp, type)) {