diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-26 12:52:43 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-26 12:52:43 +0800 |
| commit | 66b7f6722d16a261243390ed2afdc97de15b5f93 (patch) | |
| tree | d59b5611b79c442e471094e9c3e2951965a4d397 /ext/standard/file.c | |
| parent | 80a178015d6b162ff0ba7a8e8f5a08c88829cc3c (diff) | |
| parent | 4a1ecf0e8b04363901c92aea55a203fc73a24b95 (diff) | |
| download | php-git-66b7f6722d16a261243390ed2afdc97de15b5f93.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'ext/standard/file.c')
| -rw-r--r-- | ext/standard/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index c4327fab4e..ffe9b00b2b 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -764,7 +764,7 @@ PHP_FUNCTION(file) do { p++; parse_eol: - add_index_stringl(return_value, i++, estrndup(s, p-s), p-s, 0); + add_index_stringl(return_value, i++, s, p-s, 1); s = p; } while ((p = memchr(p, eol_marker, (e-p)))); } else { @@ -777,7 +777,7 @@ parse_eol: s = ++p; continue; } - add_index_stringl(return_value, i++, estrndup(s, p-s-windows_eol), p-s-windows_eol, 0); + add_index_stringl(return_value, i++, s, p-s-windows_eol, 1); s = ++p; } while ((p = memchr(p, eol_marker, (e-p)))); } |