From 30a38c5ad5c18dd14137d78f0593c5f74c0e39c7 Mon Sep 17 00:00:00 2001 From: u5surf Date: Sun, 16 Apr 2023 17:06:06 +0900 Subject: [PATCH] Fix vtsn.len type #269 --- src/ngx_http_vhost_traffic_status_dump.c | 2 +- src/ngx_http_vhost_traffic_status_node.h | 2 +- src/ngx_http_vhost_traffic_status_shm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngx_http_vhost_traffic_status_dump.c b/src/ngx_http_vhost_traffic_status_dump.c index fafe60c..5f31629 100644 --- a/src/ngx_http_vhost_traffic_status_dump.c +++ b/src/ngx_http_vhost_traffic_status_dump.c @@ -393,7 +393,7 @@ ngx_http_vhost_traffic_status_dump_restore(ngx_event_t *ev) /* read: data */ offset += n; n = ngx_read_file(&file, buf, vtsn.len, offset); - if (n != vtsn.len) { + if (n >= 0 && vtsn.len <= SSIZE_MAX && n != (ssize_t) vtsn.len) { ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ev->log, 0, "dump_restore::ngx_read_file() read:%z, data:%z failed", n, vtsn.len); diff --git a/src/ngx_http_vhost_traffic_status_node.h b/src/ngx_http_vhost_traffic_status_node.h index 3bbb53e..9cc4a0e 100644 --- a/src/ngx_http_vhost_traffic_status_node.h +++ b/src/ngx_http_vhost_traffic_status_node.h @@ -100,7 +100,7 @@ typedef struct { #endif ngx_http_vhost_traffic_status_node_upstream_t stat_upstream; - u_short len; + size_t len; u_char data[1]; } ngx_http_vhost_traffic_status_node_t; diff --git a/src/ngx_http_vhost_traffic_status_shm.c b/src/ngx_http_vhost_traffic_status_shm.c index 863b3da..78d181c 100644 --- a/src/ngx_http_vhost_traffic_status_shm.c +++ b/src/ngx_http_vhost_traffic_status_shm.c @@ -148,7 +148,7 @@ ngx_http_vhost_traffic_status_shm_add_node(ngx_http_request_t *r, vtsn = (ngx_http_vhost_traffic_status_node_t *) &node->color; node->key = hash; - vtsn->len = (u_short) key->len; + vtsn->len = key->len; ngx_http_vhost_traffic_status_node_init(r, vtsn); vtsn->stat_upstream.type = type; ngx_memcpy(vtsn->data, key->data, key->len);