[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 240/264: version: skip idn2_check_version() check and add precau
From: |
gnunet |
Subject: |
[gnurl] 240/264: version: skip idn2_check_version() check and add precaution |
Date: |
Thu, 30 Apr 2020 16:09:03 +0200 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit 3fdc4bdb5b00835a1d04cf160cd61fe7f8feb477
Author: Daniel Stenberg <address@hidden>
AuthorDate: Wed Apr 22 11:21:24 2020 +0200
version: skip idn2_check_version() check and add precaution
A gcc-10's -fanalyze complaint made me spot and do these improvements.
Closes #5281
---
lib/version.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/lib/version.c b/lib/version.c
index 47204e881..14e509606 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -85,12 +85,15 @@ static size_t brotli_version(char *buf, size_t bufsz)
* generate the exact same string and never write any temporary data like
* zeros in the data.
*/
+
+#define VERSION_PARTS 14 /* number of substrings we can concatenate */
+
char *curl_version(void)
{
static char out[300];
char *outp;
size_t outlen;
- const char *src[14];
+ const char *src[VERSION_PARTS];
#ifdef USE_SSL
char ssl_version[200];
#endif
@@ -103,7 +106,7 @@ char *curl_version(void)
#ifdef USE_ARES
char cares_version[40];
#endif
-#if defined(USE_LIBIDN2) || defined(USE_WIN32_IDN)
+#if defined(USE_LIBIDN2)
char idn_version[40];
#endif
#ifdef USE_LIBPSL
@@ -156,14 +159,11 @@ char *curl_version(void)
src[i++] = cares_version;
#endif
#ifdef USE_LIBIDN2
- if(idn2_check_version(IDN2_VERSION)) {
- msnprintf(idn_version, sizeof(idn_version),
- "libidn2/%s", idn2_check_version(NULL));
- src[i++] = idn_version;
- }
-#elif defined(USE_WIN32_IDN)
- msnprintf(idn_version, sizeof(idn_version), "WinIDN");
+ msnprintf(idn_version, sizeof(idn_version),
+ "libidn2/%s", idn2_check_version(NULL));
src[i++] = idn_version;
+#elif defined(USE_WIN32_IDN)
+ src[i++] = (char *)"WinIDN";
#endif
#ifdef USE_LIBPSL
@@ -208,6 +208,8 @@ char *curl_version(void)
}
#endif
+ DEBUGASSERT(i <= VERSION_PARTS);
+
outp = &out[0];
outlen = sizeof(out);
for(j = 0; j < i; j++) {
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 227/264: tests: run the SOCKS test server on a dynamic port number, (continued)
- [gnurl] 227/264: tests: run the SOCKS test server on a dynamic port number, gnunet, 2020/04/30
- [gnurl] 223/264: runtests: always put test number in servercmd file, gnunet, 2020/04/30
- [gnurl] 205/264: tests: make 2006-2010 handle different port number lengths, gnunet, 2020/04/30
- [gnurl] 235/264: mqtt: make NOSTATE get within the debug name array, gnunet, 2020/04/30
- [gnurl] 233/264: tests: add %NOLISTENPORT and use it, gnunet, 2020/04/30
- [gnurl] 234/264: tests: run the RTSP test server on a dynamic port number, gnunet, 2020/04/30
- [gnurl] 232/264: mqtt: remove code with no purpose, gnunet, 2020/04/30
- [gnurl] 231/264: mqtt: fix Curl_read() error handling while reading remaining length, gnunet, 2020/04/30
- [gnurl] 247/264: tests/git: ignore mqttd and port files, gnunet, 2020/04/30
- [gnurl] 248/264: docs: fix two typos, gnunet, 2020/04/30
- [gnurl] 240/264: version: skip idn2_check_version() check and add precaution,
gnunet <=
- [gnurl] 241/264: lib/mk-ca-bundle: skip empty certs, gnunet, 2020/04/30
- [gnurl] 242/264: transfer: Switch PUT to GET/HEAD on 303 redirect, gnunet, 2020/04/30
- [gnurl] 238/264: curl.h: update comment typo, gnunet, 2020/04/30
- [gnurl] 237/264: GnuTLS: Don't skip really long certificate fields, gnunet, 2020/04/30
- [gnurl] 239/264: RELEASE-NOTES: synced, gnunet, 2020/04/30
- [gnurl] 203/264: sockfilt: tidy variable naming and data structure in select_ws, gnunet, 2020/04/30
- [gnurl] 204/264: tests: run the sws server on "any port", gnunet, 2020/04/30
- [gnurl] 194/264: cmake: Avoid MSVC C4273 warnings in send/recv checks, gnunet, 2020/04/30
- [gnurl] 195/264: docs/MQTT: replace confusing 80 by 75, gnunet, 2020/04/30
- [gnurl] 193/264: KNOWN_BUGS: Add entry 'Blocking socket operations', gnunet, 2020/04/30