Merge "Merge remote-tracking branch 'origin/5.13' into dev"

1 files changed, 11 insertions, 0 deletions

diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.cpp b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
index ec088762e..6df131066 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.cpp
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
@@ -43,6 +43,7 @@
 #include "profile_adapter.h"
 #include "qwebengineprofile_p.h"
 
+#include "QFileInfo"
 
 QT_BEGIN_NAMESPACE
 
@@ -534,6 +535,16 @@ void QWebEngineDownloadItem::setPath(QString path)
         return;
     }
 
+    if (QFileInfo(path).fileName().isEmpty()) {
+        qWarning("The download path does not include file name.");
+        return;
+    }
+
+    if (QFileInfo(path).isDir()) {
+        qWarning("The download path matches with an already existing directory path.");
+        return;
+    }
+
     d->downloadPath = path;
 }
 /*!