summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Ferber <aferber@marcant.net>2014-06-19 00:15:07 +0200
committerFerenc Kovacs <tyrael@php.net>2014-06-23 09:51:44 +0200
commitc5e6c2a5f58be770603b490d23384b5fc66a38f6 (patch)
tree46de3e0a3cd4b9901aa43ff401171de293c2a8be
parentf08a5bfadc360cb53574bdb2f4dc32ac30636133 (diff)
downloadphp-git-c5e6c2a5f58be770603b490d23384b5fc66a38f6.tar.gz
Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
str_efree() must be used in zend_highlight() and zend_indent() to free string data assigned to a zval to account for interned strings.
-rw-r--r--Zend/zend_highlight.c2
-rw-r--r--Zend/zend_indent.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 68f2b7b72d..31d99b7dfe 100644
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -150,7 +150,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
case T_DOC_COMMENT:
break;
default:
- efree(token.value.str.val);
+ str_efree(token.value.str.val);
break;
}
}
diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c
index cacdf8df3b..920d412816 100644
--- a/Zend/zend_indent.c
+++ b/Zend/zend_indent.c
@@ -139,7 +139,7 @@ dflt_printout:
case T_WHITESPACE:
break;
default:
- efree(token.value.str.val);
+ str_efree(token.value.str.val);
break;
}
}