From a249c4d77a30a3c7b77a93fc660725f02fdfcf00 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Sun, 15 Feb 2009 19:23:06 +0000 Subject: [PATCH] MFB: fix getting/setting of all 16/32 bit on zip --- ext/phar/zip.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ext/phar/zip.c b/ext/phar/zip.c index b03b246dc6..358bef8726 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -19,12 +19,19 @@ #include "phar_internal.h" #ifdef WORDS_BIGENDIAN -# define PHAR_GET_32(buffer) (((((unsigned char*)(buffer))[3]) << 24) \ - | ((((unsigned char*)(buffer))[2]) << 16) \ - | ((((unsigned char*)(buffer))[1]) << 8) \ - | (((unsigned char*)(buffer))[0])) -# define PHAR_GET_16(buffer) (((((unsigned char*)(buffer))[1]) << 8) \ - | (((unsigned char*)(buffer))[0])) +static inline php_uint32 phar_fix_32(php_uint32 buffer) +{ + return ((((unsigned char *)&buffer)[3]) << 24) | + ((((unsigned char *)&buffer)[2]) << 16) | + ((((unsigned char *)&buffer)[1]) << 8) | + (((unsigned char *)&buffer)[0]); +} +static inline php_uint16 phar_fix_16(php_uint16 buffer) +{ + return ((((unsigned char *)&buffer)[1]) << 8) | ((unsigned char *)&buffer)[0]; +} +# define PHAR_GET_32(buffer) phar_fix_32((php_uint32)(buffer)) +# define PHAR_GET_16(buffer) phar_fix_16((php_uint16)(buffer)) # define PHAR_SET_32(buffer) PHAR_GET_32(buffer) # define PHAR_SET_16(buffer) PHAR_GET_16(buffer) #else -- 2.40.0