commit 27fb60619645eb440ae3aeb164cd7640ccb6c79d
author Gaurav Shah <gauravsh@google.com> Mon Nov 02 23:30:38 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 02 23:30:38 2015 +0000
tree a2b2c9d994c830e0c75f9d921027ea8a63db43e0
parent 960eaf83b42829fdf1388ed05d1f448f8fd566c7
parent 306b1d9d66ab24149f25133fd595e5cd22884cc5

Merge "Fix pointer arithmetic on a void*"
am: 306b1d9d66

* commit '306b1d9d66ab24149f25133fd595e5cd22884cc5':
  Fix pointer arithmetic on a void*

wpa_supplicant/dbus/dbus_new_handlers.c

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 1c04e92..083dca6 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -435,7 +435,7 @@
 
 	for (i = 0; i < array_len; i++) {
 		if (!dbus_message_iter_append_basic(&array_iter, type,
-						    array + i * element_size)) {
+						    (char *)array + i * element_size)) {
 			dbus_set_error(error, DBUS_ERROR_FAILED,
 				       "%s: failed to construct message 2.5",
 				       __func__);