vtls: fix missing multissl version info #12599
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
- Fix erroneous buffer copy logic from ff74cef. Prior to this change the MultiSSL version info returned to the user was empty. Closes #xxxx
|
If truncation is preferred for inadequate buffers then another way to do this would be revert that file: diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 256b8fa..dd68a06 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -1413,11 +1413,17 @@ static size_t multissl_version(char *buffer, size_t size)
backends_len = p - backends;
}
- if(size && (size < backends_len))
- strcpy(buffer, backends);
- else
- *buffer = 0; /* did not fit */
- return 0;
+ if(!size)
+ return 0;
+
+ if(size <= backends_len) {
+ strncpy(buffer, backends, size - 1);
+ buffer[size - 1] = '\0';
+ return size - 1;
+ }
+
+ strcpy(buffer, backends);
+ return backends_len;
}
static int multissl_setup(const struct Curl_ssl *backend) |
bagder
approved these changes
Dec 27, 2023
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.
Prior to this change the MultiSSL version info returned to the user was empty.
Closes #xxxx
before:
libcurl/8.6.0-DEV nghttp2/1.52.0after:
libcurl/8.6.0-DEV OpenSSL/3.0.8 (Schannel) nghttp2/1.52.0