Generalize computation of size with differing structure alignments

hpux735 · hpux735 · commit be85d0a2f9c2 · 2016-02-21T17:32:08.000Z
diff --git a/CoreFoundation/NumberDate.subproj/CFNumber.c b/CoreFoundation/NumberDate.subproj/CFNumber.c
@@ -1202,7 +1202,7 @@ CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType type, const vo
 	}
     }
 
-    CFIndex size = 8 + ((!__CFNumberTypeTable[type].floatBit && __CFNumberTypeTable[type].storageBit) ? 8 : 0);
+    CFIndex size = (sizeof(struct __CFNumber) - sizeof(CFRuntimeBase)) + ((!__CFNumberTypeTable[type].floatBit && __CFNumberTypeTable[type].storageBit) ? 8 : 0);
 #if OLD_CRAP_TOO
     size += 2 * sizeof(void *);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1202,7 +1202,7 @@ CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType type, const vo`
`1202`	`1202`	`}`
`1203`	`1203`	`}`
`1204`	`1204`
`1205`		`- CFIndex size = 8 + ((!__CFNumberTypeTable[type].floatBit && __CFNumberTypeTable[type].storageBit) ? 8 : 0);`
	`1205`	`+ CFIndex size = (sizeof(struct __CFNumber) - sizeof(CFRuntimeBase)) + ((!__CFNumberTypeTable[type].floatBit && __CFNumberTypeTable[type].storageBit) ? 8 : 0);`
`1206`	`1206`	`#if OLD_CRAP_TOO`
`1207`	`1207`	`size += 2 * sizeof(void *);`
`1208`	`1208`	`#endif`