summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2010-07-02 00:33:42 +0000
committerFelipe Pena <felipe@php.net>2010-07-02 00:33:42 +0000
commitd71b9d508e433ca127ceea3998399d910eae8a13 (patch)
treeb995f85674a1a08c875e41e0f2ea29a11da1ac74 /ext
parent22dcb6114f7eae0465fa94ed9c83b839eff44d37 (diff)
downloadphp-git-d71b9d508e433ca127ceea3998399d910eae8a13.tar.gz
- Fixed a possible interruption array leak in trim()
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/string.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 47b1610e28..4ebebacf21 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -774,6 +774,9 @@ static void php_do_trim(INTERNAL_FUNCTION_PARAMETERS, int mode)
WRONG_PARAM_COUNT;
}
+ if (PZVAL_IS_REF(*str)) {
+ SEPARATE_ZVAL(str);
+ }
convert_to_string_ex(str);
if (argc > 1) {