[pull] master from php:master#1072
Merged
Merged
Conversation
) php_intl.c is compiled as C but transitively includes formatter_data.h and listformatter_class.h, which (since 8.6) include <unicode/numfmt.h> and <unicode/listformatter.h> unconditionally. On ICU >= 64 those C++ headers are a no-op in a C compile, but ICU 63 (Debian Buster) has an unguarded "#include <cstddef>" at the top of unistr.h, so the C compile fails with "fatal error: cstddef: No such file or directory". The C path only uses the "typedef void" shim (NumberFormat*/ListFormatter* are just void*), so it needs no ICU header at all. Move the C++ include inside the existing #ifdef __cplusplus guard. No-op on newer ICU.
…22630) Dom\DtdNamedNodeMap dimension access could overflow the index when reading DTD entities or notations. This commit fix it.
Co-authored-by: Vazha Aptsiauri <v.aptsiauri@tnet.ge>
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )