diff options
| author | Stanislav Malyshev <stas@php.net> | 2017-01-02 22:08:42 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2017-01-02 22:08:42 -0800 |
| commit | b9837dc1839f59e5cd1a98c1acf30469f0f5039b (patch) | |
| tree | 1d5867a3f5427314d75877f71d04f21130bdd02f | |
| parent | 0f0406a1c98337d02b1f69ec23567cb99bdcf8e0 (diff) | |
| parent | 68ac602b283f54d81bc846692c5d52767d5f7378 (diff) | |
| download | php-git-b9837dc1839f59e5cd1a98c1acf30469f0f5039b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use correct string release function
| -rw-r--r-- | ext/standard/var_unserializer.c | 2 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 25e44e2aa6..ac543eb647 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -877,7 +877,7 @@ yy20: elements = object_common1(UNSERIALIZE_PASSTHRU, ce); if (elements < 0) { - efree(class_name); + zend_string_release(class_name); return 0; } diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index c943e10050..fdf597d75f 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -954,7 +954,7 @@ object ":" uiv ":" ["] { elements = object_common1(UNSERIALIZE_PASSTHRU, ce); if (elements < 0) { - efree(class_name); + zend_string_release(class_name); return 0; } |