Changeset 107 for Mulberry/trunk/Linux/Sources/Application/Message/CBodyTable.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/Message/CBodyTable.cp (modified) (1 diff)

Mulberry/trunk/Linux/Sources/Application/Message/CBodyTable.cp

@@ -738 +738 @@
                 {
                         // Copy to global after lock
-                        CAttachment** pAddr = reinterpret_cast<CAttachment**>(data);
-                        *((CMessage**) pAddr) = (mWindow ? mWindow->GetMessage() : mView->GetMessage());
-                        pAddr += sizeof(CMessage*);
-                        *((int*) pAddr) = attchs.size();
-                        pAddr += sizeof(int);
+                        unsigned char* ptr = data;
+                        *((CMessage**) ptr) = (mWindow ? mWindow->GetMessage() : mView->GetMessage());
+                        ptr += sizeof(CMessage*);
+                        *((int*) ptr) = attchs.size();
+                        ptr += sizeof(int);
                         for(CAttachmentList::iterator iter = attchs.begin(); iter != attchs.end(); iter++)
-                                *pAddr++ = *iter;
+                        {
+                                *((CAttachment**) ptr) = *iter;
+                                ptr += sizeof(CAttachment*);
+                        }
                         
                         seldata->SetData(type, data, dataLength);