mirror of
https://git.freebsd.org/ports.git
synced 2025-06-25 22:50:32 -04:00
984291a95a
- Fix grep -Fw not respecting -w - Fix assorted crashes and two macros These, and the previous CVE fix in _2 were Obtained from: http://patch-tracker.debian.org/package/busybox/1:1.20.0-8
22 lines
758 B
Diff
22 lines
758 B
Diff
commit e3e321682cd1e9861ba7680e61ab6dadaf1e2e32
|
|
Author: Denys Vlasenko <vda.linux@googlemail.com>
|
|
Date: Wed Feb 27 15:49:38 2013 +0100
|
|
Bug-Debian: http://bugs.debian.org/701968
|
|
|
|
Fix move_to_unaligned16
|
|
|
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
|
|
|
diff --git a/include/platform.h b/include/platform.h
|
|
index 1282306..f4deb30 100644
|
|
--- ./include/platform.h
|
|
+++ ./include/platform.h
|
|
@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
|
|
# define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
|
|
# define move_to_unaligned16(u16p, v) do { \
|
|
uint16_t __t = (v); \
|
|
- memcpy((u16p), &__t, 4); \
|
|
+ memcpy((u16p), &__t, 2); \
|
|
} while (0)
|
|
# define move_to_unaligned32(u32p, v) do { \
|
|
uint32_t __t = (v); \
|