Changeset 329

Timestamp:

Apr 13, 2008, 10:06:05 PM (17 years ago)

Author:

cinc

Message:

Fixed of by one array access bug showing only on Darwin in release builds for some strange reason. Fixed two warnings.

File:

• trunk/nom/src/nombuildclass.c (modified) (7 diffs)

trunk/nom/src/nombuildclass.c

@@ -378 +378 @@
     entries[] contain copies of the ClassDataStruct and thus the proc addresses of the static methods.
     */
-  mem=(char*)nClass->mtab; /* Target address */
+  mem=(guint8*)nClass->mtab; /* Target address */
   memcpy(mem, ncpParent->mtab, ncpParent->mtab->mtabSize); /* copy parent mtab with all proc addresses */
 #ifdef DEBUG_NOMBUILDCLASS
@@ -386 +386 @@
 #endif
 
-  mem=((char*)nClass->mtab) + ncpParent->mtab->mtabSize; /* points right after the parent mtab now in 
+  mem=((guint8*)nClass->mtab) + ncpParent->mtab->mtabSize; /* points right after the parent mtab now in 
                                                            our private struct */
   /* Add class struct of this class. This includes the proc adresses. */
@@ -432 +432 @@
 {
   NOMClassPriv *ncpParent=NULL;
+
+  DBG_NOMBUILDCLASS(TRUE, "Find NOMClassPriv for %s %x\n", chrClassName, chrClassName);
 
   if(NULL==NOMClassMgrObject){
@@ -521 +523 @@
   /* Get parent class if any */
   if(NULL!=sci->chrParentClassNames){
-    ncpParent=priv_getClassFromName(sci->chrParentClassNames[sci->ulNumParentsInChain]);
+    ncpParent=priv_getClassFromName(sci->chrParentClassNames[sci->ulNumParentsInChain-1]);
   }/* nomIdAllParents */
   else
@@ -908 +910 @@
   for(a=0;a<sci->ulNumStaticMethods;a++) {
     *sci->nomSMethods[a].nomMAddressInClassData=(void*)sci->nomSMethods[a].nomMethod; /*  Address to place the resolved function address in see *.ih files. */
-#ifdef _DEBUG_NOMBUILDCLASS
+#ifdef DEBUG_NOMBUILDCLASS
     nomPrintf("  static method: %s, %lx\n", *sci->nomSMethods[a].chrMethodDescriptor, sci->nomSMethods[a].nomMethod);
     nomPrintf("%d: %d: method: %x %s (classdata addr. %x) (Fill static class struct with procs)\n", 
@@ -915 +917 @@
   }
 
-#ifdef _DEBUG_NOMBUILDCLASS
+#ifdef DEBUG_NOMBUILDCLASS
   nomPrintf("%d: Dumping the filled classdata structure:\n", __LINE__);
   _dumpClassDataStruct(sci->nomCds, sci->ulNumStaticMethods);
@@ -941 +943 @@
 #warning !!!!! Change this when nomId is a GQuark !!!!!
 # endif
-    nomPrintf("%d: About to search parent %s...\n", __LINE__, **(sci->nomIdAllParents));
-#endif
-
-    ncpParent=priv_getClassFromName(sci->chrParentClassNames[sci->ulNumParentsInChain]);
+    nomPrintf("%d: About to search parent %s (%d)...\n", __LINE__, **(sci->nomIdAllParents), sci->ulNumParentsInChain);
+    nomPrintf("%d: About to search parent %s (%s)...\n", __LINE__, **(sci->nomIdAllParents),
+              sci->chrParentClassNames[0]);
+#endif
+
+    ncpParent=priv_getClassFromName(sci->chrParentClassNames[sci->ulNumParentsInChain-1]);
 
 #if 0