Merge branch 'PHP-5.6'

* PHP-5.6:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
This commit is contained in:
Felipe Pena 2014-05-11 09:46:47 -03:00
commit 2ed2283932

View File

@ -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)) {