Changeset 146915 in webkit

Timestamp:

Mar 26, 2013, 12:01:17 PM (12 years ago)

Author:

abecsi@webkit.org

Message:

[Qt][WK2] Fails to start QtWebProcess.exe if installed in a path containing spaces
​https://bugs.webkit.org/show_bug.cgi?id=113328

Reviewed by Jocelyn Turcotte.

Downstream bugreport: ​https://bugreports.qt-project.org/browse/QTBUG-30249

We use QProcess::start() with a commandline string to start the web process
and the string is treated by QProcess as a whitespace delimeted list of the
command and the arguments, thus we have to escape the path to the process
binaries so that if the path contains spaces we still run the appropriate
command.

• UIProcess/Launcher/qt/ProcessLauncherQt.cpp:

(WebKit::ProcessLauncher::launchProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/qt/ProcessLauncherQt.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-03-26  Andras Becsi  <andras.becsi@digia.com>
+
+        [Qt][WK2] Fails to start QtWebProcess.exe if installed in a path containing spaces
+        https://bugs.webkit.org/show_bug.cgi?id=113328
+
+        Reviewed by Jocelyn Turcotte.
+
+        Downstream bugreport: https://bugreports.qt-project.org/browse/QTBUG-30249
+
+        We use QProcess::start() with a commandline string to start the web process
+        and the string is treated by QProcess as a whitespace delimeted list of the
+        command and the arguments, thus we have to escape the path to the process
+        binaries so that if the path contains spaces we still run the appropriate
+        command.
+
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+
 2013-03-26  Andras Becsi  <andras.becsi@digia.com>
 

trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp

@@ -115 +115 @@
     QString commandLine;
     if (m_launchOptions.processType == WebProcess) {
-        commandLine = QLatin1String("%1 %2 %3");
+        commandLine = QLatin1String("%1 \"%2\" %3");
         QByteArray webProcessPrefix = qgetenv("QT_WEBKIT2_WP_CMD_PREFIX");
         commandLine = commandLine.arg(QLatin1String(webProcessPrefix.constData())).arg(QString(executablePathOfWebProcess()));
 #if ENABLE(PLUGIN_PROCESS)
     } else if (m_launchOptions.processType == PluginProcess) {
-        commandLine = QLatin1String("%1 %2 %3 %4");
+        commandLine = QLatin1String("%1 \"%2\" %3 %4");
         QByteArray pluginProcessPrefix = qgetenv("QT_WEBKIT2_PP_CMD_PREFIX");
         commandLine = commandLine.arg(QLatin1String(pluginProcessPrefix.constData())).arg(QString(executablePathOfPluginProcess()));
@@ -183 +183 @@
 #if ENABLE(SUID_SANDBOX_LINUX)
     if (m_launchOptions.processType == WebProcess) {
-        QString sandboxCommandLine = QLatin1String("%1 %2 %3");
+        QString sandboxCommandLine = QLatin1String("\"%1\" \"%2\" %3");
         sandboxCommandLine = sandboxCommandLine.arg(QCoreApplication::applicationDirPath() + QLatin1String("/SUIDSandboxHelper"));
         sandboxCommandLine = sandboxCommandLine.arg(executablePathOfWebProcess());