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)
xuenru · May 11, 2014 · 9d8a003 · 9d8a003
2 parents ece7421 + b99862e
commit 9d8a003
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)) {