Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module...

str_efree() must be used in zend_highlight() and zend_indent() to free
string data assigned to a zval to account for interned strings.

diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 68f2b7b72dcd98a74b1b1267b3be2c760cf2a2de..31d99b7dfefd7a7e5f39d0e324bab26a5f3d5c2b 100644 (file)
--- 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 cacdf8df3b8883f09f09a408029e89b4b29bb8d5..920d412816eecac549ba8979b4b34a11f744a64e 100644 (file)
--- 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;
                        }
                }