fix issue 17102 - Don't pass null to strlen in std.file.cenforce #5049
Conversation
This file contains 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
Burgos
changed the title
Burgos
changed the title
| @@ -179,7 +179,7 @@ private T cenforce(T)(T condition, const(char)[] name, const(FSChar)* namez, | |||
| import core.stdc.wchar_ : wcslen; | |||
| import std.conv : to; | |||
|
|
|||
| auto len = wcslen(namez); | |||
| auto len = namez? wcslen(namez) : 0; | |||
| @@ -196,12 +196,23 @@ private T cenforce(T)(T condition, const(char)[] name, const(FSChar)* namez, | |||
| { | |||
| import core.stdc.string : strlen; | |||
|
|
|||
| auto len = strlen(namez); | |||
| auto len = namez? strlen(namez) : 0; | |||
Huh, I thought I fixed both, let me see. |
|
Updated with spaces around |
JackStouffer
requested changes
Jan 21, 2017
file name is a string with a default value While trying to build the file name for exception from 0terminated namez, don't pass null to strlen
|
|
Updated. |
JackStouffer
approved these changes
Jan 21, 2017
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.
https://issues.dlang.org/show_bug.cgi?id=17102