diff options
| author | Felipe Pena <felipensp@gmail.com> | 2014-05-11 09:46:38 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2014-05-11 09:46:38 -0300 |
| commit | 9d8a00337dc92273e1006cfc72e21dcc4217fa9b (patch) | |
| tree | 2dd0a1f17ceccc64c6d5d31b20cf414fc7cd8384 | |
| parent | ece7421864354b11e93a2b49f1409cceebd1225e (diff) | |
| parent | b99862e7ae4336c5bdb20514f845e63c6c1b43f6 (diff) | |
| download | php-git-9d8a00337dc92273e1006cfc72e21dcc4217fa9b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
| -rw-r--r-- | ext/phar/phar_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 407edda0fb..75aadfbc54 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -1477,7 +1477,7 @@ static int phar_build(zend_object_iterator *iter, void *puser TSRMLS_DC) /* {{{ } close_fp = 0; - opened = (char *) estrndup(str, sizeof("[stream]") + 1); + opened = (char *) estrndup(str, sizeof("[stream]") - 1); goto after_open_fp; case IS_OBJECT: if (instanceof_function(Z_OBJCE_PP(value), spl_ce_SplFileInfo TSRMLS_CC)) { |