fix macro so that 5-byte BIT values are decoded correctly

faizshukri · faizshukri · commit 2bc887e1d33d · 2009-12-02T11:58:04.000Z
diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h
@@ -247,10 +247,10 @@ typedef unsigned long long uint64_t;
 									(((uint32_t) (((zend_uchar*) (A))[0])) << 24)))
 
 #define bit_uint5korr(A)  ((uint64_t)(((uint32_t) ((zend_uchar) (A)[4])) +\
-                                  (((uint32_t) ((zend_uchar) (A)[3])) << 8) +\
-                                  (((uint32_t) ((zend_uchar) (A)[2])) << 16) +\
-                                  (((uint32_t) ((zend_uchar) (A)[1])) << 24)) +\
-                               (((uint64_t) ((zend_uchar) (A)[0])) << 32))
+                                  (((uint32_t) ((zend_uchar*) (A)[3])) << 8) +\
+                                  (((uint32_t) ((zend_uchar*) (A)[2])) << 16) +\
+                                  (((uint32_t) ((zend_uchar*) (A)[1])) << 24)) +\
+                               (((uint64_t) ((zend_uchar*) (A)[0])) << 32))
 
 #define bit_uint6korr(A)	((uint64_t)(((uint32_t) (((zend_uchar*) (A))[5])) +\
 									(((uint32_t) (((zend_uchar*) (A))[4])) << 8) +\
