MFH: also check password

diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index a9014f9d850b750e9f9b6dfb9595fce7fc1eb386..a346f814fb497dc296905fe90810dd8c635811f4 100644 (file)
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -113,7 +113,7 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, char *path
 {
        php_stream *stream = NULL, *reuseid = NULL;
        php_url *resource = NULL;
-       int result, use_ssl, use_ssl_on_data = 0;
+       int result, use_ssl, use_ssl_on_data = 0, tmp_len;
        char *scratch;
        char tmp_line[512];
 
@@ -206,23 +206,24 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, char *path
 #endif
        }
 
+#define PHP_FTP_CNTRL_CHK(val, val_len, err_msg) {     \
+       unsigned char *s = val, *e = s + val_len;       \
+       while (s < e) { \
+               if (iscntrl(*s)) {      \
+                       php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, err_msg, val); \
+                       goto connect_errexit;   \
+               }       \
+               s++;    \
+       }       \
+}
+
        /* send the user name */
        php_stream_write_string(stream, "USER ");
        if (resource->user != NULL) {
-               unsigned char *s, *e;
-               int user_len = php_raw_url_decode(resource->user, strlen(resource->user));
-               
-               s = resource->user;
-               e = s + user_len;
-               /* check for control characters that should not be present in the user name */
-               while (s < e) {
-                       if (iscntrl(*s)) {
-                               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Invalid login %s", resource->user);
-                               goto connect_errexit;
-                       }
-                       s++;
-               }
-               
+               tmp_len = php_raw_url_decode(resource->user, strlen(resource->user));
+
+               PHP_FTP_CNTRL_CHK(resource->user, tmp_len, "Invalid login %s")
+
                php_stream_write_string(stream, resource->user);
        } else {
                php_stream_write_string(stream, "anonymous");
@@ -238,7 +239,10 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, char *path
 
                php_stream_write_string(stream, "PASS ");
                if (resource->pass != NULL) {
-                       php_raw_url_decode(resource->pass, strlen(resource->pass));
+                       tmp_len = php_raw_url_decode(resource->pass, strlen(resource->pass));
+
+                       PHP_FTP_CNTRL_CHK(resource->pass, tmp_len, "Invalid password %s")
+
                        php_stream_write_string(stream, resource->pass);
                } else {
                        /* if the user has configured who they are,