Skip to content

Commit

Permalink
batman-adv: Don't do pointer arithmetic with void*
Browse files Browse the repository at this point in the history
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: Sven Eckelmann <sven@narfation.org>
  • Loading branch information
Sven Eckelmann committed May 30, 2011
1 parent 16f14b4 commit 38e3c5f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/batman-adv/originator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/* 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),
(max_if_num - del_if_num) * chunk_size);

Expand All @@ -579,7 +579,7 @@ static int orig_node_del_if(struct orig_node *orig_node,
memcpy(data_ptr, orig_node->bcast_own_sum,
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)),
(max_if_num - del_if_num) * sizeof(uint8_t));

Expand Down

0 comments on commit 38e3c5f

Please sign in to comment.