Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

2 files changed, 14 insertions, 1 deletions

diff --git a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
index bd4e370..291c3e7 100644
--- a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
+++ b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
@@ -24,6 +24,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "RunLoop.h"
 #include <runtime/InitializeThreading.h>
 #include "WebProcess.h"
@@ -160,7 +161,18 @@ QWEBKIT_EXPORT int WebProcessMainQt(int argc, char** argv)
     RunLoop::initializeMainRunLoop();
 
     // Create the connection.
-    QString identifier(app->arguments().size() > 1 ? app->arguments().at(1) : "");
+    if (app->arguments().size() <= 1) {
+        qDebug() << "Error: wrong number of arguments.";
+        return 1;
+    }
+
+    bool wasNumber = false;
+    int identifier = app->arguments().at(1).toInt(&wasNumber, 10);
+    if (!wasNumber) {
+        qDebug() << "Error: connection identifier wrong.";
+        return 1;
+    }
+
     WebKit::WebProcess::shared().initialize(identifier, RunLoop::main());
 
     RunLoop::run();
diff --git a/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp
index 53a51d3..c45ea32 100644
--- a/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp
+++ b/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp
@@ -23,6 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "WebProcess.h"
 
 #include "WebProcessCreationParameters.h"