Skip to content

Commit e089fe2

Browse files
committed
Initalized req resp and int overflow fixes for server_counter
1 parent a20d5d3 commit e089fe2

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

src/wh_server_counter.c

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,17 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
5656

5757
switch (action) {
5858
case WH_COUNTER_INIT: {
59-
whMessageCounter_InitRequest req;
60-
whMessageCounter_InitResponse resp;
59+
whMessageCounter_InitRequest req = {0};
60+
whMessageCounter_InitResponse resp = {0};
6161

6262
/* translate request */
6363
(void)wh_MessageCounter_TranslateInitRequest(
6464
magic, (whMessageCounter_InitRequest*)req_packet, &req);
6565

6666
/* write 0 to nvm with the supplied id and user_id */
6767
meta->id = WH_MAKE_KEYID(WH_KEYTYPE_COUNTER,
68-
server->comm->client_id, req.counterId);
68+
(uint16_t)server->comm->client_id,
69+
(uint16_t)req.counterId);
6970
/* use the label buffer to hold the counter value */
7071
*counter = req.counter;
7172
ret = wh_Nvm_AddObjectWithReclaim(server->nvm, meta, 0, NULL);
@@ -83,8 +84,8 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
8384
} break;
8485

8586
case WH_COUNTER_INCREMENT: {
86-
whMessageCounter_IncrementRequest req;
87-
whMessageCounter_IncrementResponse resp;
87+
whMessageCounter_IncrementRequest req = {0};
88+
whMessageCounter_IncrementResponse resp = {0};
8889

8990
/* translate request */
9091
(void)wh_MessageCounter_TranslateIncrementRequest(
@@ -93,8 +94,8 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
9394
/* read the counter, stored in the metadata label */
9495
ret = wh_Nvm_GetMetadata(server->nvm,
9596
WH_MAKE_KEYID(WH_KEYTYPE_COUNTER,
96-
server->comm->client_id,
97-
req.counterId),
97+
(uint16_t)server->comm->client_id,
98+
(uint16_t)req.counterId),
9899
meta);
99100
resp.rc = ret;
100101

@@ -128,8 +129,8 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
128129
} break;
129130

130131
case WH_COUNTER_READ: {
131-
whMessageCounter_ReadRequest req;
132-
whMessageCounter_ReadResponse resp;
132+
whMessageCounter_ReadRequest req = {0};
133+
whMessageCounter_ReadResponse resp = {0};
133134

134135
/* translate request */
135136
(void)wh_MessageCounter_TranslateReadRequest(
@@ -138,8 +139,8 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
138139
/* read the counter, stored in the metadata label */
139140
ret = wh_Nvm_GetMetadata(server->nvm,
140141
WH_MAKE_KEYID(WH_KEYTYPE_COUNTER,
141-
server->comm->client_id,
142-
req.counterId),
142+
(uint16_t)server->comm->client_id,
143+
(uint16_t)req.counterId),
143144
meta);
144145
resp.rc = ret;
145146

@@ -158,15 +159,16 @@ int wh_Server_HandleCounter(whServerContext* server, uint16_t magic,
158159
} break;
159160

160161
case WH_COUNTER_DESTROY: {
161-
whMessageCounter_DestroyRequest req;
162-
whMessageCounter_DestroyResponse resp;
162+
whMessageCounter_DestroyRequest req = {0};
163+
whMessageCounter_DestroyResponse resp = {0};
163164

164165
/* translate request */
165166
(void)wh_MessageCounter_TranslateDestroyRequest(
166167
magic, (whMessageCounter_DestroyRequest*)req_packet, &req);
167168

168169
counterId = WH_MAKE_KEYID(WH_KEYTYPE_COUNTER,
169-
server->comm->client_id, req.counterId);
170+
(uint16_t)server->comm->client_id,
171+
(uint16_t)req.counterId);
170172

171173
ret = wh_Nvm_DestroyObjects(server->nvm, 1, &counterId);
172174
resp.rc = ret;

0 commit comments

Comments
 (0)