Changeset 107 for Mulberry/trunk/Linux/Sources/Application/Server/CServerTable.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/Server/CServerTable.cp (modified) (4 diffs)

Mulberry/trunk/Linux/Sources/Application/Server/CServerTable.cp

@@ -740 +740 @@
                 if (data)
                 {
-                        int* i = reinterpret_cast<int*>(data);
-                        *i = count;
-                        i++;
-                        void** vdata = reinterpret_cast<void**>(i);
+                        unsigned char* ptr = data;
+                        *((int*) ptr) = count;
+                        ptr += sizeof(int);
+                        void** vdata = reinterpret_cast<void**>(ptr);
                         for(ulvector::const_iterator iter = rows.begin(); iter != rows.end(); iter++)
                         {
@@ -1325 +1325 @@
                 }
 
-                //int count = *((int*) drag_data)++;
                 int count = *((int*)drag_data);
                 drag_data += sizeof(int);
@@ -1357 +1356 @@
         else if (theFlavor == CMulberryApp::sFlavorWDList)
         {
-                //int count = *((int*) drag_data)++;
                 int count = *(int*)(drag_data);
                 drag_data += sizeof(int);
@@ -1401 +1399 @@
         else if (theFlavor == CMulberryApp::sFlavorMboxList)
         {
-                //int count = *((int*) drag_data)++;
                 int count = *(int*)drag_data;
                 drag_data += sizeof(int);