Trim env var for startup check #395
Closed
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
Signed-off-by: 1000TurquoisePogs <[email protected]>
Signed-off-by: 1000TurquoisePogs <[email protected]>
| if (!strcmp(continueWithWarning, "true")) { | ||
| /* using STDENV in JCL can result in env values that need trimming... */ | ||
| char *trimmed[strlen(continueWithWarning)+1]; | ||
| strncpy(trimmed, continueWithWarning, strlen(continueWithWarning)); |
There was a problem hiding this comment.
This will leave the destination unterminated because trimmed isn't initialized to zeroes; trimRight may 0C4.
| @@ -121,7 +121,12 @@ void abortIfUnsupportedCAA() { | |||
| #ifndef METTLE | |||
| if (zosVersion > LE_MAX_SUPPORTED_ZOS) { | |||
| const char *continueWithWarning = getenv("ZWE_zowe_launcher_unsafeDisableZosVersionCheck"); | |||
| if (!strcmp(continueWithWarning, "true")) { | |||
| /* using STDENV in JCL can result in env values that need trimming... */ | |||
| char *trimmed[strlen(continueWithWarning)+1]; | |||
There was a problem hiding this comment.
@JoeNemo just pointed to a bug here. This shouldn't have *.
| @@ -121,7 +121,12 @@ void abortIfUnsupportedCAA() { | |||
| #ifndef METTLE | |||
| if (zosVersion > LE_MAX_SUPPORTED_ZOS) { | |||
| const char *continueWithWarning = getenv("ZWE_zowe_launcher_unsafeDisableZosVersionCheck"); | |||
| if (!strcmp(continueWithWarning, "true")) { | |||
| /* using STDENV in JCL can result in env values that need trimming... */ | |||
| char *trimmed[strlen(continueWithWarning)+1]; | |||
There was a problem hiding this comment.
Can you just save the length once and reuse it?
size_t valueLen = strlen(continueWithWarning);
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.
Like in the launcher, any code that's expected to be run with env vars set from JCL should also expect that env vars can come in with trailing spaces.
This is a little ugly but the version-checking code in this PR is expected to be entirely removed soon, so this is another stop-gap to get people able to use zowe on untested versions of zos.