Changeset 69615 in vbox

Timestamp:

Nov 8, 2017 1:04:15 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118975

Message:

FE/Qt: Fixing a crush causing by a dangling reference to QByteArray

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -3324 +3324 @@
 
 #ifdef VBOX_WS_X11
-void VBoxGlobal::setWMClass(QWidget *pWidget, const char *pStrName, const char *pStrClass)
+void VBoxGlobal::setWMClass(QWidget *pWidget, const QString &strNameString, const QString &strClassString)
 {
     /* Make sure all arguments set: */
-    AssertReturnVoid(pWidget && pStrName && pStrClass);
-
-    /* Create duplicates to avoid casting away constness: */
-    char *pWindowName = strdup(pStrName);
-    char *pWindowClass = strdup(pStrClass);
-    AssertReturnVoid(pWindowName && pWindowClass);
+    AssertReturnVoid(pWidget && !strNameString.isNull() && !strClassString.isNull());
+
+    /* Define QByteArray object to make sure data is alive within the scope: */
+    QByteArray nameByteArray = strNameString.toLatin1();
+    QByteArray classByteArray = strClassString.toLatin1();
+
+    AssertReturnVoid(nameByteArray.data() && classByteArray.data());
 
     XClassHint windowClass;
-    windowClass.res_name = pWindowName;
-    windowClass.res_class = pWindowClass;
+    windowClass.res_name = nameByteArray.data();
+    windowClass.res_class = classByteArray.data();
     /* Set WM_CLASS of the window to passed name and class strings: */
     XSetClassHint(QX11Info::display(), pWidget->window()->winId(), &windowClass);
-
-    /* Free duplicates: */
-    XFree(windowClass.res_class);
-    XFree(windowClass.res_name);
 }
 #endif /* VBOX_WS_X11 */

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -455 +455 @@
 #ifdef VBOX_WS_X11
     /** Assigns WM_CLASS property for passed @a pWidget. */
-    static void setWMClass(QWidget *pWidget, const char *pStrName, const char *pStrClass);
+    static void setWMClass(QWidget *pWidget, const QString &strNameString, const QString &strClassString);
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -99 +99 @@
     /* Compose window name: */
     const QString strWindowName = QString("VirtualBox Machine UUID: %1").arg(vboxGlobal().managedVMUuid());
-
-    /* Assign it to both WM_CLASS name & class for now: */
-    const char *pBuffer = strWindowName.toLatin1().constData();
-    if (pBuffer)
-        vboxGlobal().setWMClass(this, pBuffer, pBuffer);
-    else
-        vboxGlobal().setWMClass(this, "VirtualBox Machine", "VirtualBox Machine");
+    vboxGlobal().setWMClass(this, strWindowName, strWindowName);
 #endif