Commit 38e3c5f0 authored by Sven Eckelmann's avatar Sven Eckelmann
Browse files

batman-adv: Don't do pointer arithmetic with void* 



The size of void is currently set by gcc to 1, but is not well defined
in general. Therefore it is more advisable to cast it to char* before
doing pointer arithmetic.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent 16f14b45

net/batman-adv/originator.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -559,7 +559,7 @@ static int orig_node_del_if(struct orig_node *orig_node, 
	memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);

	memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);





	/* copy second part */

	/* copy second part */

	memcpy(data_ptr + del_if_num * chunk_size,

	memcpy((char *)data_ptr + del_if_num * chunk_size,

	       orig_node->bcast_own + ((del_if_num + 1) * chunk_size),

	       orig_node->bcast_own + ((del_if_num + 1) * chunk_size),

	       (max_if_num - del_if_num) * chunk_size);

	       (max_if_num - del_if_num) * chunk_size);
@@ -579,7 +579,7 @@ free_bcast_own: 
	memcpy(data_ptr, orig_node->bcast_own_sum,

	memcpy(data_ptr, orig_node->bcast_own_sum,

	       del_if_num * sizeof(uint8_t));

	       del_if_num * sizeof(uint8_t));





	memcpy(data_ptr + del_if_num * sizeof(uint8_t),

	memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t),

	       orig_node->bcast_own_sum + ((del_if_num + 1) * sizeof(uint8_t)),

	       orig_node->bcast_own_sum + ((del_if_num + 1) * sizeof(uint8_t)),

	       (max_if_num - del_if_num) * sizeof(uint8_t));

	       (max_if_num - del_if_num) * sizeof(uint8_t));

CRA Git | Maintained and supported by SUSTech CRA and CCSE