From fd1912669668663c87ca88b5360171cbd7dd6e63 Mon Sep 17 00:00:00 2001
From: "SND\\EreTIk_cp" <SND\EreTIk_cp@9b283d60-5439-405e-af05-b73fd8c4d996>
Date: Thu, 10 Jan 2013 11:07:54 +0000
Subject: [PATCH] [0.2.x] ~fix append zero-size field

git-svn-id: https://pykd.svn.codeplex.com/svn@82225 9b283d60-5439-405e-af05-b73fd8c4d996
---
 pykd/customtypes.cpp            |  3 ++-
 test/scripts/customtypestest.py | 24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pykd/customtypes.cpp b/pykd/customtypes.cpp
index 3a9a959..28afe27 100644
--- a/pykd/customtypes.cpp
+++ b/pykd/customtypes.cpp
@@ -81,7 +81,8 @@ void CustomStruct::appendField(const std::string &fieldName, TypeInfoPtr &fieldT
     ULONG offset = m_size;
     ULONG align = fieldSize < m_align ? fieldSize : m_align;
 
-    offset += offset % align > 0 ? align - offset % align : 0;
+    if (align)
+        offset += offset % align > 0 ? align - offset % align : 0;
 
     field->setOffset( offset );
 
diff --git a/test/scripts/customtypestest.py b/test/scripts/customtypestest.py
index b6b5b2a..57ec03c 100644
--- a/test/scripts/customtypestest.py
+++ b/test/scripts/customtypestest.py
@@ -45,9 +45,9 @@ class CustomTypesTest(unittest.TestCase):
         # print myType
 
     def testCommonUnion(self):
-    
+
         tb = pykd.typeBuilder()
-    
+        
         myType = tb.createUnion("MyCustomStruct")
         myType.append( "m_uint1", tb.UInt1B )
         myType.append( "m_uint4", tb.UInt4B )
@@ -58,6 +58,24 @@ class CustomTypesTest(unittest.TestCase):
         self.assertTrue( myType.fieldOffset("m_uint4") == 0 )
         self.assertTrue( myType.fieldOffset("m_uint2") == 0 )
 
+    def testEmptyType(self):
+        tb = pykd.typeBuilder()
+
+        myEmptyStruct1 = tb.createStruct("EmptyStruct1")
+        self.assertEqual( 0, myEmptyStruct1.size() )
+
+        myEmptyStruct1.append("m_emptyStruct2", tb.createStruct("EmptyStruct2"))
+        self.assertEqual( 0, myEmptyStruct1.size() )
+
+        myEmptyUnion1 = tb.createUnion("EmptyUnion1")
+        self.assertEqual( 0, myEmptyUnion1.size() )
+
+        myEmptyStruct1.append("m_emptyUnion2", myEmptyUnion1)
+        self.assertEqual( 0, myEmptyStruct1.size() )
+
+        myEmptyUnion1.append("m_emptyStruct3", tb.createStruct("EmptyStruct3"))
+        self.assertEqual( 0, myEmptyUnion1.size() )
+
     def testDupFieldName(self):
     
         tb = pykd.typeBuilder()
@@ -95,7 +113,7 @@ class CustomTypesTest(unittest.TestCase):
         self.assertEqual( 2, tb.WChar.size() )
         self.assertEqual( 4, tb.Long.size() )
         self.assertEqual( 4, tb.ULong.size() )
-        
+
     def testVoidPtr(self):
         self.assertEqual( 4, pykd.typeBuilder(4).VoidPtr.size() )
         self.assertEqual( 8, pykd.typeBuilder(8).VoidPtr.size() )