Fix bug #79075: FFI header parser chokes on comments #17082
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nielsdos
force-pushed
the
fix-bug79075
branch
from
4d94716 to
ab5e628
Compare
The directives for FFI should be first in the file, which is fine, however sometimes there can be comments or whitespace before or between these defines. One practical example is for license information or when a user adds newlines "by accident". In these cases, it's quite confusing that the directives do not work properly. To solve this, make the zend_ffi_parse_directives() aware of comments.
dstogov
reviewed
Dec 9, 2024
ext/ffi/ffi.c
Outdated
Comment on lines
4975
to
4978
| while (*p && (*p != '*' || p[1] != '/')) { | ||
| p++; | ||
| } | ||
| p += 2; |
There was a problem hiding this comment.
This may cause read after the terminating zero.
dstogov
approved these changes
Dec 9, 2024
charmitro
pushed a commit
to wasix-org/php
that referenced
this pull request
Mar 13, 2025
The directives for FFI should be first in the file, which is fine, however sometimes there can be comments or whitespace before or between these defines. One practical example is for license information or when a user adds newlines "by accident". In these cases, it's quite confusing that the directives do not work properly. To solve this, make the zend_ffi_parse_directives() aware of comments. Closes phpGH-17082.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The directives for FFI should be first in the file, which is fine, however sometimes there can be comments or whitespace before or between these defines. One practical example is for license information or when a user adds newlines before the directives "by accident". In these cases, it's quite confusing that the directives do not work properly.
To solve this, make the zend_ffi_parse_directives() aware of comments.
One alternative is to actually call back from the parser when parsing a define line instead of treating a
#symbol like a comment.