Changeset 107 for Mulberry/trunk/Linux/Sources/Application/Address_Book/CGroupTable.cp

Timestamp:

09/15/07 20:20:13 (1 year ago)

Author:

daboo

Message:

Fix some bad pointer arithmetic errors. This fixes crashes during drag and drop.

Files:

• Mulberry/trunk/Linux/Sources/Application/Address_Book/CGroupTable.cp (modified) (2 diffs)

Mulberry/trunk/Linux/Sources/Application/Address_Book/CGroupTable.cp

@@ -1218 +1218 @@
                 {
                         // Copy to global after lock
-                        CGroup** pGrp = reinterpret_cast<CGroup**>(data);
-                        *((unsigned long*) pGrp) = grps.size();
-                        pGrp += sizeof(unsigned long);
+                        unsigned char* ptr = data;
+                        *((unsigned long*) ptr) = grps.size();
+                        ptr += sizeof(unsigned long);
                         for(CGroupList::iterator iter = grps.begin(); iter != grps.end(); iter++)
-                                *pGrp++ = *iter;
+                        {
+                                *((CGroup**) ptr) = *iter;
+                                ptr += sizeof(CGroup*);
+                        }
 
                         seldata->SetData(type, data, dataLength);
@@ -1246 +1249 @@
                 {
                         // Copy to global after lock
-                        CAddress** pAddr = reinterpret_cast<CAddress**>(data);
-                        *((unsigned long*) pAddr) = addrs.size();
-                        pAddr += sizeof(unsigned long);
+                        unsigned char* ptr = data;
+                        *((unsigned long*) ptr) = addrs.size();
+                        ptr += sizeof(unsigned long);
                         for(CAddressList::iterator iter = addrs.begin(); iter != addrs.end(); iter++)
-                                *pAddr++ = *iter;
+                        {
+                                *((CAddress**) ptr) = *iter;
+                                ptr += sizeof(CAddress*);
+                        }
 
                         seldata->SetData(type, data, dataLength);