Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

coverity: change ss handle priv style

Browse source 
Coverity is able to misunderstand &h[1] to be a dereference
of h, when it is just (h + 1).

Adapt places where we use this style to get a pointer to the
SS priv data to use (h + 1).
This commit is contained in:
Andy Green 2022-01-28 08:40:49 +00:00
parent a3a4253ba9
commit c24148826b
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/secure-streams/protocols/ss-h2.c
View file

@ -52,7 +52,7 @@ secstream_h2(struct lws *wsi, enum lws_callback_reasons reason, void *user,
*/ */
lwsl_info("%s: reporting initial tx cr from server %d\n", lwsl_info("%s: reporting initial tx cr from server %d\n",
__func__, wsi->txc.tx_cr); __func__, wsi->txc.tx_cr);
ss_proxy_onward_txcr((void *)&h[1], wsi->txc.tx_cr); ss_proxy_onward_txcr((void *)(h + 1), wsi->txc.tx_cr);
} }
#endif #endif
@ -106,7 +106,7 @@ secstream_h2(struct lws *wsi, enum lws_callback_reasons reason, void *user,
#if defined(LWS_WITH_SECURE_STREAMS_PROXY_API) #if defined(LWS_WITH_SECURE_STREAMS_PROXY_API)
if (h->being_serialized) if (h->being_serialized)
/* we are the proxy-side SS for a remote client */ /* we are the proxy-side SS for a remote client */
ss_proxy_onward_txcr((void *)&h[1], (int)len); ss_proxy_onward_txcr((void *)(h + 1), (int)len);
#endif #endif
break; break;

8
lib/secure-streams/secure-streams.c
View file

@ -608,7 +608,7 @@ lws_smd_ss_cb(void *opaque, lws_smd_class_t _class,
lws_ser_wu64be(p + 8, (uint64_t)timestamp); lws_ser_wu64be(p + 8, (uint64_t)timestamp);
if (h->info.rx) if (h->info.rx)
h->info.rx((void *)&h[1], p, len + LWS_SMD_SS_RX_HEADER_LEN, h->info.rx((void *)(h + 1), p, len + LWS_SMD_SS_RX_HEADER_LEN,
LWSSS_FLAG_SOM | LWSSS_FLAG_EOM); LWSSS_FLAG_SOM | LWSSS_FLAG_EOM);
return 0; return 0;
@ -628,7 +628,7 @@ lws_ss_smd_tx_cb(lws_sorted_usec_list_t *sul)
if (!h->info.tx) if (!h->info.tx)
return; return;
n = h->info.tx(&h[1], h->txord++, buf, &len, &flags); n = h->info.tx(h + 1, h->txord++, buf, &len, &flags);
if (n) if (n)
/* nonzero return means don't want to send anything */ /* nonzero return means don't want to send anything */
return; return;
@ -1122,7 +1122,7 @@ lws_ss_create(struct lws_context *context, int tsi, const lws_ss_info_t *ssi,
h->proxy_onward = 1; h->proxy_onward = 1;
/* start of overallocated area */ /* start of overallocated area */
p = (char *)&h[1]; p = (char *)(h + 1);
/* set the handle pointer in the user data struct */ /* set the handle pointer in the user data struct */
v = (void **)(p + ssi->handle_offset); v = (void **)(p + ssi->handle_offset);
@ -1389,7 +1389,7 @@ fail_creation:
void * void *
lws_ss_to_user_object(struct lws_ss_handle *h) lws_ss_to_user_object(struct lws_ss_handle *h)
{ {
return (void *)&h[1]; return (void *)(h + 1);
} }
void void

4
lib/secure-streams/serialized/client/sspc-transport.c
View file

@ -210,7 +210,7 @@ lws_sspc_txp_rx_from_proxy(lws_transport_priv_t txp_priv, const uint8_t *in,
size_t len) size_t len)
{ {
lws_sspc_handle_t *h = (lws_sspc_handle_t *)txp_priv; lws_sspc_handle_t *h = (lws_sspc_handle_t *)txp_priv;
void *m = (void *)((uint8_t *)&h[1]); void *m = (void *)((uint8_t *)(h + 1));
assert(h); assert(h);
@ -229,7 +229,7 @@ lws_ss_state_return_t
lws_sspc_txp_tx(lws_sspc_handle_t *h, size_t metadata_limit) lws_sspc_txp_tx(lws_sspc_handle_t *h, size_t metadata_limit)
{ {
uint8_t *pkt = NULL, *p = NULL, *end = NULL; uint8_t *pkt = NULL, *p = NULL, *end = NULL;
void *m = (void *)((uint8_t *)&h[1]); void *m = (void *)((uint8_t *)(h + 1));
lws_ss_state_return_t r; lws_ss_state_return_t r;
uint8_t _s[64 + LWS_PRE], *s = _s + LWS_PRE, *cp = s; uint8_t _s[64 + LWS_PRE], *s = _s + LWS_PRE, *cp = s;
size_t txl, len; size_t txl, len;

6
lib/secure-streams/serialized/client/sspc.c
View file

@ -273,7 +273,7 @@ lws_sspc_event_helper(lws_sspc_handle_t *h, lws_ss_constate_t cs,
return LWSSSSRET_OK; return LWSSSSRET_OK;
h->h_in_svc = h; h->h_in_svc = h;
ret = h->ssi.state((void *)((uint8_t *)&h[1]), NULL, cs, flags); ret = h->ssi.state((void *)((uint8_t *)(h + 1)), NULL, cs, flags);
h->h_in_svc = NULL; h->h_in_svc = NULL;
return ret; return ret;
@ -343,7 +343,7 @@ lws_sspc_create(struct lws_context *context, int tsi, const lws_ss_info_t *ssi,
h->txp_path.ops_onw->name); h->txp_path.ops_onw->name);
memcpy(&h->ssi, ssi, sizeof(*ssi)); memcpy(&h->ssi, ssi, sizeof(*ssi));
ua = (uint8_t *)&h[1]; ua = (uint8_t *)(h + 1);
memset(ua, 0, ssi->user_alloc); memset(ua, 0, ssi->user_alloc);
p = (char *)ua + ssi->user_alloc; p = (char *)ua + ssi->user_alloc;
memcpy(p, ssi->streamtype, strlen(ssi->streamtype) + 1); memcpy(p, ssi->streamtype, strlen(ssi->streamtype) + 1);
@ -788,7 +788,7 @@ lws_sspc_cancel_timeout(struct lws_sspc_handle *h)
void * void *
lws_sspc_to_user_object(struct lws_sspc_handle *h) lws_sspc_to_user_object(struct lws_sspc_handle *h)
{ {
return (void *)&h[1]; return (void *)(h + 1);
} }
struct lws_log_cx * struct lws_log_cx *