diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-11-04 18:23:20 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-11-04 18:23:20 +0100 |
| commit | 90b4ec51adad6791b508d65b81e45233d687c23f (patch) | |
| tree | ef95c6262d00fec157efd8d1ff7942697bd91ab0 | |
| parent | ad8ee7422531501b2e11dcdc9d4a2ea9ed3d25ef (diff) | |
| download | php-git-90b4ec51adad6791b508d65b81e45233d687c23f.tar.gz | |
Fix bad merge
| -rw-r--r-- | ext/standard/file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 97ffe69453..4804e49338 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -344,7 +344,7 @@ PHP_FUNCTION(flock) php_stream *stream; zend_long operation = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &res, &operation, &wouldblock) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z/", &res, &operation, &wouldblock) == FAILURE) { return; } @@ -1207,8 +1207,10 @@ PHPAPI PHP_FUNCTION(fwrite) if (ZEND_NUM_ARGS() == 2) { num_bytes = inputlen; + } else if (maxlen <= 0) { + num_bytes = 0; } else { - num_bytes = MAX(0, MIN((size_t) maxlen, inputlen)); + num_bytes = MIN((size_t) maxlen, inputlen); } if (!num_bytes) { |