mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential buffer overflow.

Browse Source
This commit is contained in:
Sara Golemon 2003-01-27 19:51:50 +00:00
parent 9bb3dc6903
commit d0cb097c52
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/ftp/ftp.c
View File

@ -538,23 +538,31 @@ ftp_rmdir(ftpbuf_t *ftp, const char *dir)
/* {{{ ftp_chmod
*/
int
ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename)
ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filename_len)
{
char buffer[1024];
char *buffer;
if (ftp == NULL) {
if (ftp == NULL || filename_len <= 0) {
return 0;
}
if (!(buffer = emalloc(32 + filename_len + 1))) {
return 0;
}
sprintf(buffer, "CHMOD %o %s", mode, filename);
if (!ftp_putcmd(ftp, "SITE", buffer)) {
efree(buffer);
return 0;
}
efree(buffer);
if (!ftp_getresp(ftp) || ftp->resp != 200) {
return 0;
}
return 1;
}
/* }}} */

2
ext/ftp/ftp.h
View File

@ -136,7 +136,7 @@ char* ftp_mkdir(ftpbuf_t *ftp, const char *dir);
int ftp_rmdir(ftpbuf_t *ftp, const char *dir);
/* Set permissions on a file */
int ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename);
int ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filename_len);
/* returns a NULL-terminated array of filenames in the given path
* or NULL on error. the return array must be freed (but don't

2
ext/ftp/php_ftp.c
View File

@ -396,7 +396,7 @@ PHP_FUNCTION(ftp_chmod)
ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf);
if (!ftp_chmod(ftp, mode, filename)) {
if (!ftp_chmod(ftp, mode, filename, filename_len)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf);
RETURN_FALSE;
}