diff options
| author | Wez Furlong <wez@php.net> | 2002-10-15 16:45:26 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-10-15 16:45:26 +0000 |
| commit | 2f6952c9364b0fdbfd94f81722dbcf903fca697d (patch) | |
| tree | f6a53596b0cb6f8bd95f9cf992c6385e1b7f10a4 | |
| parent | c2624f42698f768c4e06f5529d6b89f7784c1682 (diff) | |
| download | php-git-2f6952c9364b0fdbfd94f81722dbcf903fca697d.tar.gz | |
Nope, that last one wasn't a leak in main/streams.c, it was
file_get_contents misinterpreting the result...
| -rw-r--r-- | ext/standard/file.c | 2 | ||||
| -rwxr-xr-x | main/streams.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index b264a2a637..dfec2d67cf 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -435,7 +435,7 @@ PHP_FUNCTION(file_get_contents) } /* uses mmap if possible */ - if ((len = php_stream_copy_to_mem(stream, &contents, PHP_STREAM_COPY_ALL, 0)) > 0) { + if ((len = php_stream_copy_to_mem(stream, &contents, PHP_STREAM_COPY_ALL, 0)) >= 0) { if (PG(magic_quotes_runtime)) { contents = php_addslashes(contents, len, &newlen, 1 TSRMLS_CC); /* 1 = free source string */ diff --git a/main/streams.c b/main/streams.c index a8ddccb1c5..8597d6bf33 100755 --- a/main/streams.c +++ b/main/streams.c @@ -1028,7 +1028,7 @@ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen #endif srcfile = mmap(NULL, maxlen, PROT_READ, MAP_SHARED, srcfd, 0); - if (srcfile != (void*)MAP_FAILED && ret > 0) { + if (srcfile != (void*)MAP_FAILED) { *buf = pemalloc_rel_orig(maxlen + 1, persistent); |