Changeset 335 for trunk/src/gui/kernel

Timestamp:

Nov 20, 2009, 10:55:57 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: mime: Don't store the shared block size at its end (doesn't seem to be actually necessary).

File:

• trunk/src/gui/kernel/qmime_pm.cpp (modified) (5 diffs)

trunk/src/gui/kernel/qmime_pm.cpp

@@ -176 +176 @@
         return 0;
     }
+
+
+
     // get the size rounded to the page boundary (4K)
     ULONG sz = ~0, flags = 0;
@@ -189 +192 @@
     // store the exact size to the last dword of the last page
     *(((ULONG *)(data + sz)) - 1) = size;
+
 
     return data;
@@ -388 +392 @@
         QByteArray str = mimeData->text().toLocal8Bit();
         // Anticipate required space for CRLFs at 1/40
-        int maxsize = str.size()+str.size()/40+3;
+        int maxsize = str.size()+str.size()/40+;
         r.fill('\0', maxsize);
         char *o = r.data();
@@ -407 +411 @@
             }
             o[j++] = c;
-            if (j+3 >= maxsize) {
+            if (j+ >= maxsize) {
                 maxsize += maxsize/4;
                 r.resize(maxsize);
@@ -413 +417 @@
             }
         }
-        o[j] = 0;
+        if (j < r.size())
+            o[j] = '\0';
     } else if (format == CF_TextUnicode) {
         QString str = mimeData->text();