Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some various changes #1759

Merged
merged 6 commits into from Aug 12, 2015
Merged

Some various changes #1759

merged 6 commits into from Aug 12, 2015

Conversation

fabpot
Copy link
Contributor

@fabpot fabpot commented Aug 12, 2015

No description provided.

stof and others added 6 commits August 12, 2015 17:44
This also fixes the logic detecting reserved macro names to account for
the fact that they are compiled prefixed with get() since a very long
time and the logic preventing conflicts was broken.
This also forbids access to other internal parts of the Twig_Template.
@fabpot fabpot merged commit e5b7c03 into twigphp:1.x Aug 12, 2015
fabpot added a commit that referenced this pull request Aug 12, 2015
This PR was merged into the 1.x branch.

Discussion
----------

Some various changes

Commits
-------

e5b7c03 updated CHANGELOG
2250060 Fix the accessibility of Twig_Template::getEnvironment method in the C ext
e000420 Fix the handling of internal Twig_Template properties in the C ext
a8a125b Forbid access to the Twig environment from template instance
30be077 fixed sandbox security issue
7b6c0e9 Prevent importing or calling reserved macro names
@twigphp twigphp locked and limited conversation to collaborators Aug 12, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants