archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed Bug #42057 (fwrite() writes data into file when length is given as a negative value)

Browse source
This commit is contained in:
Felipe Pena 2008-02-04 18:45:40 +00:00
parent 223764b66d
commit aa79b70645
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/standard/file.c
View file

@ -1359,22 +1359,20 @@ PHPAPI PHP_FUNCTION(fwrite)
RETURN_NULL(); RETURN_NULL();
} }
if (!write_len) { if (write_len <= 0) {
RETURN_LONG(0); RETURN_LONG(0);
} }
php_stream_from_zval(stream, &zstream); php_stream_from_zval(stream, &zstream);
if (Z_TYPE_P(zstring) == IS_UNICODE) { if (Z_TYPE_P(zstring) == IS_UNICODE) {
if (write_len >= 0) {
/* Convert code units to data points */ /* Convert code units to data points */
int32_t write_uchars = 0; int32_t write_uchars = 0;
U16_FWD_N(Z_USTRVAL_P(zstring), write_uchars, Z_USTRLEN_P(zstring), write_len); U16_FWD_N(Z_USTRVAL_P(zstring), write_uchars, Z_USTRLEN_P(zstring), write_len);
write_len = write_uchars; write_len = write_uchars;
}
if (write_len < 0 || write_len > Z_USTRLEN_P(zstring)) { if (write_len > Z_USTRLEN_P(zstring)) {
write_len = Z_USTRLEN_P(zstring); write_len = Z_USTRLEN_P(zstring);
} }
ret = php_stream_write_unicode(stream, Z_USTRVAL_P(zstring), write_len); ret = php_stream_write_unicode(stream, Z_USTRVAL_P(zstring), write_len);
@ -1385,7 +1383,7 @@ PHPAPI PHP_FUNCTION(fwrite)
} }
} else { } else {
convert_to_string(zstring); convert_to_string(zstring);
if (write_len < 0 || write_len > Z_STRLEN_P(zstring)) { if (write_len > Z_STRLEN_P(zstring)) {
write_len = Z_STRLEN_P(zstring); write_len = Z_STRLEN_P(zstring);
} }