[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-common-cvs
Subject:    [Common-cvs] include hxtypes.h,1.24.4.6.2.1,1.24.4.6.2.1.8.1
From:       sblanding () helixcommunity ! org
Date:       2010-03-25 23:33:12
Message-ID: 201003252333.o2PNXRql003951 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv24166

Modified Files:
      Tag: bainbridge
	hxtypes.h 
Log Message:
prevent overflow in HX_ENCODE_PROD_VERSION macro


Index: hxtypes.h
===================================================================
RCS file: /cvsroot/common/include/hxtypes.h,v
retrieving revision 1.24.4.6.2.1
retrieving revision 1.24.4.6.2.1.8.1
diff -u -d -r1.24.4.6.2.1 -r1.24.4.6.2.1.8.1
--- hxtypes.h	29 Sep 2008 18:12:47 -0000	1.24.4.6.2.1
+++ hxtypes.h	25 Mar 2010 23:33:09 -0000	1.24.4.6.2.1.8.1
@@ -690,8 +690,8 @@
 */
 
 #define HX_ENCODE_PROD_VERSION(major,minor,release,build)   \
-            ((ULONG32)((ULONG32)major << 28) | ((ULONG32)minor << 20) | \
-            ((ULONG32)release << 12) | (ULONG32)build)
+            ((ULONG32)(((ULONG32)0x7 & (ULONG32)major) << 28) | (((ULONG32)0xF & \
(ULONG32)minor) << 20) | \ +            (((ULONG32)0xF & (ULONG32)release) << 12) | \
((ULONG32)0xFFF & (ULONG32)build))  
 #define HX_ENCODE_ADD_PRIVATE_FIELD(ulversion,ulprivate) \
 			((ULONG32)((ULONG32)(ulversion) & (UINT32)0xFFFFFF00) | (ULONG32)(ulprivate) )


_______________________________________________
Common-cvs mailing list
Common-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/common-cvs


[prev in list] [next in list] [prev in thread] [next in thread]