summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2021-01-22 11:19:06 -0500
committerGlenn Strauss <gstrauss@gluelogic.com>2021-01-29 03:10:21 -0500
commit5ccebbf04ead9de9e9e22d52015f7cd5606d3956 (patch)
treec3ef1b9d90bf96c4d98ad008bfad0534b82de4c2
parent33e400b4298b14d5f195baff5ecb1ad61662e6ed (diff)
downloadlighttpd-git-5ccebbf04ead9de9e9e22d52015f7cd5606d3956.tar.gz
[multiple] quiet some clang-analyzer warnings
-rw-r--r--src/h2.c2
-rw-r--r--src/mod_cgi.c2
-rw-r--r--src/mod_fastcgi.c2
-rw-r--r--src/t/test_request.c1
4 files changed, 4 insertions, 3 deletions
diff --git a/src/h2.c b/src/h2.c
index d0c31b42..79b6ee3a 100644
--- a/src/h2.c
+++ b/src/h2.c
@@ -1479,7 +1479,7 @@ h2_parse_frames (connection * const con)
*/
if (cqlen < 9+flen) return 1; /* incomplete frame; go on */
if (clen < 9+flen) {
- clen = h2_frame_cq_compact(cq, 9+flen);
+ clen = h2_frame_cq_compact(cq, 9+flen); UNUSED(clen);
c = cq->first; /*(reload after h2_frame_cq_compact())*/
s = (uint8_t *)(c->mem->ptr + c->offset);
}
diff --git a/src/mod_cgi.c b/src/mod_cgi.c
index 8415126e..7f68a640 100644
--- a/src/mod_cgi.c
+++ b/src/mod_cgi.c
@@ -513,7 +513,7 @@ static int cgi_env_add(void *venv, const char *key, size_t key_len, const char *
dst = env->ptr + env->used;
memcpy(dst, key, key_len);
dst[key_len] = '=';
- memcpy(dst + key_len + 1, val, val_len);
+ if (val_len) memcpy(dst + key_len + 1, val, val_len);
dst[key_len + 1 + val_len] = '\0';
if (env->osize == env->oused) {
diff --git a/src/mod_fastcgi.c b/src/mod_fastcgi.c
index d56ec3ae..20cacc5a 100644
--- a/src/mod_fastcgi.c
+++ b/src/mod_fastcgi.c
@@ -190,7 +190,7 @@ static int fcgi_env_add(void *venv, const char *key, size_t key_len, const char
dst = buffer_string_prepare_append(env, len);
memcpy(dst, len_enc, len_enc_len);
memcpy(dst + len_enc_len, key, key_len);
- memcpy(dst + len_enc_len + key_len, val, val_len);
+ if (val_len) memcpy(dst + len_enc_len + key_len, val, val_len);
buffer_commit(env, len);
return 0;
diff --git a/src/t/test_request.c b/src/t/test_request.c
index 887614c1..00e384ad 100644
--- a/src/t/test_request.c
+++ b/src/t/test_request.c
@@ -29,6 +29,7 @@ static void run_http_request_parse(request_st * const r, int line, int status, c
memcpy(hdrs, req, reqlen);
hloffsets[0] = 1;
hloffsets[1] = 0;
+ hloffsets[2] = 0;
for (const char *n=req, *end=req+reqlen; (n=memchr(n,'\n',end-n)); ++n) {
if (++hloffsets[0] >= sizeof(hloffsets)/sizeof(*hloffsets)) break;
hloffsets[hloffsets[0]] = n - req + 1;