iliaa Tue Oct 5 19:53:10 2004 EDT
Modified files:
/php-src/ext/ftp ftp.c
Log:
Fixed bug #30027 (Possible crash inside ftp_get()).
# Patch by cfield at affinitysolutions dot com
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.105&r2=1.106&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.105 php-src/ext/ftp/ftp.c:1.106
--- php-src/ext/ftp/ftp.c:1.105 Mon Sep 27 10:29:55 2004
+++ php-src/ext/ftp/ftp.c Tue Oct 5 19:53:09 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.105 2004/09/27 14:29:55 hyanantha Exp $ */
+/* $Id: ftp.c,v 1.106 2004/10/05 23:53:09 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -860,12 +860,12 @@
ptr = s;
}
#else
- while ((s = memchr(ptr, '\r', (e - ptr)))) {
+ while (e > ptr && (s = memchr(ptr, '\r', (e - ptr)))) {
php_stream_write(outstream, ptr, (s - ptr));
if (*(s + 1) == '\n') {
s++;
+ php_stream_putc(outstream, '\n');
}
- php_stream_putc(outstream, '\n');
ptr = s + 1;
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
