gssapi: improve handling of errors from gss_display_status #8832
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
In case gss_display_status() returns an error, avoid trying to add it to the buffer as the message may well be a NULL pointer. While there, also initialize the status_string variable correctly. Originally this fix comes from a discussion in issue curl#8816. Closes: #xxxx Reviewed-by: xxxx
jay
approved these changes
May 12, 2022
There was a problem hiding this comment.
status_string is also missing an initialization in socks_gssapi, you could amend for that or if not i will add it in a separate commit
diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 8ef2f8f..0895d94 100644
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -51,7 +51,7 @@ static int check_gss_err(struct Curl_easy *data,
if(GSS_ERROR(major_status)) {
OM_uint32 maj_stat, min_stat;
OM_uint32 msg_ctx = 0;
- gss_buffer_desc status_string;
+ gss_buffer_desc status_string = GSS_C_EMPTY_BUFFER;
char buf[1024];
size_t len;
|
status_string is also missing an initialization in socks_gssapi, you could amend for that or if not i will add it in a separate commit
Done.
|
jay
referenced
this pull request
May 14, 2022
Explicitly initialize gss_buffer_desc strings such that a call to freeing resources will succeed even if no data has been allocated to it. Reported-by: Jay Satiro <raysatiro@yahoo.com>
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.
In case gss_display_status() returns an error, avoid trying to add
it to the buffer as the message may well be a NULL pointer. While
there, also initialize the status_string variable correctly.
Originally this fix comes from a discussion in issue #8816.
Closes: #xxxx
Reviewed-by: xxxx