Changeset 106467 in vbox for trunk/src/VBox

Timestamp:

Oct 18, 2024 7:15:30 AM (5 months ago)

Author:

vboxsync

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

165293

Message:

FE/Qt: bugref:10786 Sanitize file object names. take 2

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoContentBrowser.cpp (modified) (2 diffs)
• UIVisoContentBrowser.h (modified) (2 diffs)
• UIVisoCreator.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -422 +422 @@
 }
 
+/* static */
+QString UIVisoContentBrowser::sanitizePath(const QString &strOriginal)
+{
+    /* Look for white space and double quote: */
+    QRegularExpression regex("[\\s\"]");
+    if (!regex.match(strOriginal).hasMatch())
+        return strOriginal;
+    QString strNew(strOriginal);
+    strNew.replace("\"", "\\\"");
+    strNew.append("\"");
+    strNew.prepend("\"");
+    return strNew;
+}
+
 QStringList UIVisoContentBrowser::entryList()
 {
@@ -429 +443 @@
         if (iterator.value().isEmpty())
             continue;
-        QString strEntry = QString("%1=%2").arg(iterator.key()).arg(iterator.value());
+        QString strEntry = QString("%1=%2").arg(sanitizePath(iterator.key())).arg(sanitizePath(iterator.value()));
         entryList << strEntry;
     }

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.h

@@ -89 +89 @@
 
     void setSortCaseSensitive(bool fCaseSensitive);
+    static QString sanitizePath(const QString &strOriginal);
 
 public slots:
@@ -157 +158 @@
     void        createLoadedFileEntries(const QMap<QString, QString> &fileEntries);
     /* Processes a list of VISO paths that are loaded from a file and indicate file object to be removed from VISO content. */
-    void        processRemovedEntries(const QStringList &removedEntries);
-    void        markRemovedUnremovedItemParents(UIFileSystemItem *pItem, bool fRemoved);
-    void        enableDisableSelectionDependentActions();
-    void        updateNavigationWidgetPath(const QString &strPath);
-    void        setFileTableLabelText(const QString &strText);
-    void        enableForwardBackwardActions();
+    void           processRemovedEntries(const QStringList &removedEntries);
+    void           markRemovedUnremovedItemParents(UIFileSystemItem *pItem, bool fRemoved);
+    void           enableDisableSelectionDependentActions();
+    void           updateNavigationWidgetPath(const QString &strPath);
+    void           setFileTableLabelText(const QString &strText);
+    void           enableForwardBackwardActions();
+
     UIVisoContentTableView *m_pTableView;
     UIFileSystemModel      *m_pModel;

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -985 +985 @@
         QTextStream stream(&file);
         stream << QString("%1 %2").arg("--iprt-iso-maker-file-marker-bourne-sh").arg(QUuid::createUuid().toString()) << "\n";
-        stream<< "--volume-id=" << strVisoName << "\n";
+        stream<< "--volume-id=" << UIVisoContentBrowser::sanitizePath(strVisoName) << "\n";
         if (!strImportedISOPath.isEmpty())
             stream << "--import-iso=" << strImportedISOPath << "\n";