From aa3dc8847539b6f40fdd58a7e82c6e0fa690fbc2 Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Sun, 29 Apr 2018 19:19:44 +0200
Subject: [PATCH] Avoid pointer arithmetic involving void pointers.
---
gtests/net/packetdrill/wire_client.c | 2 +-
gtests/net/packetdrill/wire_conn.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gtests/net/packetdrill/wire_client.c b/gtests/net/packetdrill/wire_client.c
index 6d1194b3..b47c54f8 100644
--- a/gtests/net/packetdrill/wire_client.c
+++ b/gtests/net/packetdrill/wire_client.c
@@ -227,7 +227,7 @@ static void wire_client_receive_packets_done(struct wire_client *wire_client)
/* Die with the error message from the server, which
* is a C string following the fixed "done" message.
*/
- die("%s", (char *)(buf + sizeof(done)));
+ die("%s", (char *)buf + sizeof(done));
} else if (ntohl(done.num_events) != wire_client->num_events) {
char *msg = NULL;
asprintf(&msg, "bad wire server: bad message count: "
diff --git a/gtests/net/packetdrill/wire_conn.c b/gtests/net/packetdrill/wire_conn.c
index 1302cbdd..5c744a56 100644
--- a/gtests/net/packetdrill/wire_conn.c
+++ b/gtests/net/packetdrill/wire_conn.c
@@ -179,7 +179,7 @@ static int write_bytes(struct wire_conn *conn,
}
assert(bytes_written <= buf_len);
buf_len -= bytes_written;
- buf += bytes_written;
+ buf = (char *)buf + bytes_written;
}
return STATUS_OK;
}
@@ -223,7 +223,7 @@ static int read_bytes(struct wire_conn *conn,
}
assert(bytes_read <= buf_len);
buf_len -= bytes_read;
- buf += bytes_read;
+ buf = (char *)buf + bytes_read;
}
return STATUS_OK;
}
--
GitLab