Changeset 83116 in webkit

Timestamp:

Apr 6, 2011 4:06:03 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-06 Siddharth Mathur <​siddharth.mathur@nokia.com>

Reviewed by Benjamin Poulain.

[Qt][WK2][Symbian] Remove use of stack arrays with variable size
​https://bugs.webkit.org/show_bug.cgi?id=57877

For better compiler portability, use new/delete for arrays when size
isn't known at compile time. Also fix one compiler warning about bitshift
operations on signed integers.

• Platform/CoreIPC/qt/ConnectionQt.cpp: (CoreIPC::Connection::readyReadHandler): (CoreIPC::Connection::sendOutgoingMessage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/qt/ConnectionQt.cpp (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-06  Siddharth Mathur  <siddharth.mathur@nokia.com>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt][WK2][Symbian] Remove use of stack arrays with variable size
+        https://bugs.webkit.org/show_bug.cgi?id=57877
+        
+        For better compiler portability, use new/delete for arrays when size
+        isn't known at compile time. Also fix one compiler warning about bitshift
+        operations on signed integers. 
+        * Platform/CoreIPC/qt/ConnectionQt.cpp: 
+        (CoreIPC::Connection::readyReadHandler): 
+        (CoreIPC::Connection::sendOutgoingMessage):
+
 2011-04-06  Brian Weinstein  <bweinstein@apple.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp

@@ -49 +49 @@
 
 enum {
-    MessageBodyIsOOL = 1 << 31
+    MessageBodyIsOOL = 1U << 31
 };
 
@@ -148 +148 @@
     AttachmentResourceGuard<Deque<Attachment>, Deque<Attachment>::iterator> attachementDisposer(attachments);
 
-    char attachmentDescriptorBuffer[CMSG_SPACE(sizeof(int) * (attachmentMaxAmount))];
+    OwnArrayPtr<char> attachmentDescriptorBuffer = adoptArrayPtr(new char[CMSG_SPACE(sizeof(int) * (attachmentMaxAmount))]);
     struct msghdr message;
     memset(&message, 0, sizeof(message));
@@ -155 +155 @@
     memset(&iov, 0, sizeof(iov));
 
-    message.msg_control = attachmentDescriptorBuffer;
+    message.msg_control = attachmentDescriptorBuffer.get();
     message.msg_controllen = CMSG_SPACE(sizeof(int) * (attachmentMaxAmount));
 
@@ -185 +185 @@
     if (messageInfo.attachmentCount()) {
         if (controlMessage && controlMessage->cmsg_level == SOL_SOCKET && controlMessage->cmsg_type == SCM_RIGHTS) {
-            size_t attachmentSizes[messageInfo.attachmentCount()];
-            memcpy(attachmentSizes, messageData, sizeof(attachmentSizes));
+            OwnArrayPtr<size_t> attachmentSizes = adoptArrayPtr(new size_t[messageInfo.attachmentCount()]);
+            memcpy(attachmentSizes.get(), messageData, sizeof(size_t) * messageInfo.attachmentCount());
 
             messageData += sizeof(attachmentSizes);
 
-            int fileDescriptors[messageInfo.attachmentCount()];
-            memcpy(fileDescriptors, CMSG_DATA(controlMessage), sizeof(fileDescriptors));
+            OwnArrayPtr<int> fileDescriptors = adoptArrayPtr(new int[messageInfo.attachmentCount()]);
+            memcpy(fileDescriptors.get(), CMSG_DATA(controlMessage), sizeof(int) * messageInfo.attachmentCount());
 
             int attachmentCount = messageInfo.attachmentCount();
@@ -321 +321 @@
     iov[0].iov_len = sizeof(messageInfo);
 
-    char attachmentFDBuffer[CMSG_SPACE(sizeof(int) * (attachments.size()))];
-    size_t attachmentSizes[attachments.size()];
+    OwnArrayPtr<char> attachmentFDBuffer = adoptArrayPtr(new char[CMSG_SPACE(sizeof(int) * attachments.size())]);
+    OwnArrayPtr<size_t> attachmentSizes = adoptArrayPtr(new size_t[attachments.size()]);
 
     if (!attachments.isEmpty()) {
-        message.msg_control = attachmentFDBuffer;
-        message.msg_controllen = sizeof(attachmentFDBuffer);
+        message.msg_control = attachmentFDBuffer.get();
+        message.msg_controllen = sizeof(char) * CMSG_SPACE(sizeof(int) * attachments.size());
 
         struct cmsghdr* cmsg = CMSG_FIRSTHDR(&message);
@@ -341 +341 @@
         message.msg_controllen = cmsg->cmsg_len;
 
-        iov[iovLength].iov_base = attachmentSizes;
-        iov[iovLength].iov_len = sizeof(attachmentSizes);
+        iov[iovLength].iov_base = attachmentSizes.get();
+        iov[iovLength].iov_len = sizeof(size_t) * attachments.size();
         ++iovLength;
     }