Fix creation of GeoPDF with exported themes containing slashes

Fixes #51480
qgis · Feb 1, 2023 · 83e7b2c · 83e7b2c
1 parent 9d7dae6
commit 83e7b2c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/core/qgsabstractgeopdfexporter.cpp b/src/core/qgsabstractgeopdfexporter.cpp
@@ -123,7 +123,10 @@ bool QgsAbstractGeoPdfExporter::finalize( const QList<ComponentLayerDetail> &com
 
 QString QgsAbstractGeoPdfExporter::generateTemporaryFilepath( const QString &filename ) const
 {
-  return mTemporaryDir.filePath( filename );
+  QString cleanedFileName = filename;
+  cleanedFileName.replace( '\\', '_' );
+  cleanedFileName.replace( '/', '_' );
+  return mTemporaryDir.filePath( cleanedFileName );
 }
 
 bool QgsAbstractGeoPdfExporter::compositionModeSupported( QPainter::CompositionMode mode )

diff --git a/tests/src/core/testqgslayoutgeopdfexport.cpp b/tests/src/core/testqgslayoutgeopdfexport.cpp
@@ -37,6 +37,7 @@ class TestQgsLayoutGeoPdfExport : public QgsTest
   private slots:
     void initTestCase();// will be called before the first testfunction is executed.
     void cleanupTestCase();// will be called after the last testfunction was executed.
+    void testTempFilenames();
     void testCollectingFeatures();
     void skipLayers();
     void layerOrder();
@@ -53,6 +54,23 @@ void TestQgsLayoutGeoPdfExport::cleanupTestCase()
   QgsApplication::exitQgis();
 }
 
+void TestQgsLayoutGeoPdfExport::testTempFilenames()
+{
+  QgsProject p;
+  QgsLayout l( &p );
+  QgsLayoutGeoPdfExporter geoPdfExporter( &l );
+
+  QString outputFile = geoPdfExporter.generateTemporaryFilepath( QStringLiteral( "test_src.pdf" ) );
+  QVERIFY( outputFile.endsWith( QStringLiteral( "test_src.pdf" ) ) );
+
+  // test generating temporary file path with slash characters (https://github.com/qgis/QGIS/issues/51480)
+  outputFile = geoPdfExporter.generateTemporaryFilepath( QStringLiteral( "test/ src.pdf" ) );
+  QVERIFY( outputFile.endsWith( QStringLiteral( "test_ src.pdf" ) ) );
+
+  outputFile = geoPdfExporter.generateTemporaryFilepath( QStringLiteral( "test\\ src.pdf" ) );
+  QVERIFY( outputFile.endsWith( QStringLiteral( "test_ src.pdf" ) ) );
+}
+
 void TestQgsLayoutGeoPdfExport::testCollectingFeatures()
 {
   QgsVectorLayer *linesLayer = new QgsVectorLayer( TEST_DATA_DIR + QStringLiteral( "/lines.shp" ),