romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-08 11:04:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

silence gcc 9.2.0 warnings

Browse source 
```
In file included from /Users/runner/work/curl/curl/curl/_x64-linux-musl-bld/lib/CMakeFiles/libcurl_object.dir/Unity/unity_0_c.c:472:
/Users/runner/work/curl/curl/curl/lib/vquic/curl_ngtcp2.c: In function 'cf_ngtcp2_send':
/Users/runner/work/curl/curl/curl/lib/vquic/curl_ngtcp2.c:1511:38: error: potential null pointer dereference [-Werror=null-dereference]
 1511 |     nva[i].value = (unsigned char *)e->value;
      |                                     ~^~~~~~~
/Users/runner/work/curl/curl/curl/lib/vquic/curl_ngtcp2.c:1510:23: error: potential null pointer dereference [-Werror=null-dereference]
 1510 |     nva[i].namelen = e->namelen;
      |                      ~^~~~~~~~~
/Users/runner/work/curl/curl/curl/lib/vquic/curl_ngtcp2.c:1509:37: error: potential null pointer dereference [-Werror=null-dereference]
 1509 |     nva[i].name = (unsigned char *)e->name;
      |                                    ~^~~~~~
/Users/runner/work/curl/curl/curl/lib/vquic/curl_ngtcp2.c:1512:24: error: potential null pointer dereference [-Werror=null-dereference]
 1512 |     nva[i].valuelen = e->valuelen;
      |                       ~^~~~~~~~~~
```
https://github.com/curl/curl/actions/runs/16527769182/job/46745369854?pr=18025
This commit is contained in:
Viktor Szakats 2025-07-25 19:39:57 +02:00
parent 975e871833
commit 9dfd8a2d87
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
4 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/vquic/curl_msh3.c
View file

@ -642,10 +642,14 @@ static CURLcode cf_msh3_send(struct Curl_cfilter *cf, struct Curl_easy *data,
for(i = 0; i < nheader; ++i) {
struct dynhds_entry *e = Curl_dynhds_getn(&h2_headers, i);
nva[i].Name = e->name;
nva[i].NameLength = e->namelen;
nva[i].Value = e->value;
nva[i].ValueLength = e->valuelen;
if(e) {
nva[i].Name = e->name;
nva[i].NameLength = e->namelen;
nva[i].Value = e->value;
nva[i].ValueLength = e->valuelen;
}
else
memset(&nva[i], 0, sizeof(*nva));
}
CURL_TRC_CF(data, cf, "req: send %zu headers", nheader);

14
lib/vquic/curl_ngtcp2.c
View file

@ -1506,11 +1506,15 @@ static CURLcode h3_stream_open(struct Curl_cfilter *cf,
for(i = 0; i < nheader; ++i) {
struct dynhds_entry *e = Curl_dynhds_getn(&h2_headers, i);
nva[i].name = (unsigned char *)e->name;
nva[i].namelen = e->namelen;
nva[i].value = (unsigned char *)e->value;
nva[i].valuelen = e->valuelen;
nva[i].flags = NGHTTP3_NV_FLAG_NONE;
if(e) {
nva[i].name = (unsigned char *)e->name;
nva[i].namelen = e->namelen;
nva[i].value = (unsigned char *)e->value;
nva[i].valuelen = e->valuelen;
nva[i].flags = NGHTTP3_NV_FLAG_NONE;
}
else
memset(&nva[i], 0, sizeof(*nva));
}
rc = ngtcp2_conn_open_bidi_stream(ctx->qconn, &sid, data);

14
lib/vquic/curl_osslq.c
View file

@ -1914,11 +1914,15 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
for(i = 0; i < nheader; ++i) {
struct dynhds_entry *e = Curl_dynhds_getn(&h2_headers, i);
nva[i].name = (unsigned char *)e->name;
nva[i].namelen = e->namelen;
nva[i].value = (unsigned char *)e->value;
nva[i].valuelen = e->valuelen;
nva[i].flags = NGHTTP3_NV_FLAG_NONE;
if(e) {
nva[i].name = (unsigned char *)e->name;
nva[i].namelen = e->namelen;
nva[i].value = (unsigned char *)e->value;
nva[i].valuelen = e->valuelen;
nva[i].flags = NGHTTP3_NV_FLAG_NONE;
}
else
memset(&nva[i], 0, sizeof(*nva));
}
DEBUGASSERT(stream->s.id == -1);

12
lib/vquic/curl_quiche.c
View file

@ -1009,10 +1009,14 @@ static CURLcode h3_open_stream(struct Curl_cfilter *cf,
for(i = 0; i < nheader; ++i) {
struct dynhds_entry *e = Curl_dynhds_getn(&h2_headers, i);
nva[i].name = (unsigned char *)e->name;
nva[i].name_len = e->namelen;
nva[i].value = (unsigned char *)e->value;
nva[i].value_len = e->valuelen;
if(e) {
nva[i].name = (unsigned char *)e->name;
nva[i].name_len = e->namelen;
nva[i].value = (unsigned char *)e->value;
nva[i].value_len = e->valuelen;
}
else
memset(&nva[i], 0, sizeof(*nva));
}
*pnwritten = (size_t)nwritten;