diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 15:49:24 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 15:49:24 +0400 |
| commit | 7320abbaa94ec4d7ee22f57bb1d6f640099acd74 (patch) | |
| tree | 013c6a654c0b8ccda14df4e0d8b30c1e69913d2f | |
| parent | 50d899dda3d225c962fec1b8cce1cb880c84999e (diff) | |
| download | php-git-7320abbaa94ec4d7ee22f57bb1d6f640099acd74.tar.gz | |
Reverted "efree(args);" removed by mistake
| -rw-r--r-- | ext/standard/array.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 9c741ed613..c6806d3521 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4316,6 +4316,7 @@ PHP_FUNCTION(array_map) for (i = 0; i < n_arrays; i++) { if (Z_TYPE(arrays[i]) != IS_ARRAY) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument #%d should be an array", i + 2); + efree(args); efree(array_len); efree(array_pos); return; @@ -4335,6 +4336,7 @@ PHP_FUNCTION(array_map) RETVAL_ZVAL(args[0], 1, 0); efree(array_len); efree(array_pos); + efree(args); return; } @@ -4386,6 +4388,7 @@ PHP_FUNCTION(array_map) if (zend_call_function(&fci, &fci_cache TSRMLS_CC) != SUCCESS || Z_TYPE(result) == IS_UNDEF) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "An error occurred while invoking the map callback"); efree(array_len); + efree(args); efree(array_pos); zval_dtor(return_value); efree(params); @@ -4408,6 +4411,7 @@ PHP_FUNCTION(array_map) efree(params); efree(array_len); efree(array_pos); + efree(args); } /* }}} */ |