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

upstream merge 2020-01-27 #19

Merged
merged 4 commits into from
Jan 27, 2020
Merged

upstream merge 2020-01-27 #19

merged 4 commits into from
Jan 27, 2020

Conversation

compnerd
Copy link
Collaborator

No description provided.

compnerd and others added 4 commits January 24, 2020 17:27
This resorts to the variable substitution to ensure the path embedded is
correct.  Without this, the path at the time of the configuration.  In
the case of the Swift project, this ended up searching in the *source*
directory rather than the *build* directory.  This will ensure that we
export the file to an absolute location and we use the same location in
the `cmarkConfig.cmake` file by means of CMake's `configure_file`
subsitution.
Introduced by a recent commit. Found by OSS-Fuzz.
In a recent commit, the check was changed to strcmp, but we really
have to use strncmp.
@compnerd
Copy link
Collaborator Author

CC: @akyrtzi @shahmishal

@compnerd
Copy link
Collaborator Author

test run at apple/swift#29473

@compnerd
Copy link
Collaborator Author

All the tests pass. @akyrtzi would you mind merging this? This unblocks apple/swift#29438

@akyrtzi akyrtzi merged commit 1168665 into apple:master Jan 27, 2020
@compnerd compnerd deleted the 20200127 branch January 27, 2020 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants