aboutsummaryrefslogtreecommitdiff
path: root/include/platform.h
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-11-26 15:26:31 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-11-26 15:26:31 +0100
commit57be1eefab8494efd96bcec0f54a84cef3f61e95 (patch)
treef8bf39c2184693726dd06bc4a084054f02d1e761 /include/platform.h
parent1e1136025b2e6316f2cfaca76699a2d9de900aef (diff)
downloadbusybox-57be1eefab8494efd96bcec0f54a84cef3f61e95.tar.gz
busybox-57be1eefab8494efd96bcec0f54a84cef3f61e95.tar.bz2
ping: fix unaligned access. closes bug 745.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include/platform.h')
-rw-r--r--include/platform.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/platform.h b/include/platform.h
index 8ed05a4ad..a41daa08c 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -194,12 +194,14 @@
* a lvalue. This makes it more likely to not swap them by mistake
*/
#if defined(i386) || defined(__x86_64__)
+# define move_from_unaligned_int(v, intp) ((v) = *(int*)(intp))
# define move_from_unaligned16(v, u16p) ((v) = *(uint16_t*)(u16p))
# define move_from_unaligned32(v, u32p) ((v) = *(uint32_t*)(u32p))
# define move_to_unaligned32(u32p, v) (*(uint32_t*)(u32p) = (v))
/* #elif ... - add your favorite arch today! */
#else
/* performs reasonably well (gcc usually inlines memcpy here) */
+# define move_from_unaligned_int(v, intp) (memcpy(&(v), (intp), sizeof(int)))
# define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
# define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
# define move_to_unaligned32(u32p, v) do { \