summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-03-15 15:00:15 +0100
committerKirill Burtsev <kirill.burtsev@qt.io>2022-03-24 22:03:53 +0100
commite8e381119ca5b08add50d13ab9d275d9ab55471c (patch)
tree2368fdc56a2032da866cad1f2b9a4e34bd0cdbe4 /src/core
parent67a59057b107ed8bea4db818538f4d30b793a90e (diff)
Avoid crashing on context free web actions
If a web action that depends on a context is called, do nothing instead of crashing. Pick-to: 6.3 6.2 Fixes: QTBUG-101724 Change-Id: I7a0040a58e9dc7fa14f0cae71cf1bcd086b61c54 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/api/qwebenginepage.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index b793daed0..783101a10 100644
--- a/src/core/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -1286,26 +1286,26 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
d->adapter->unselect();
break;
case OpenLinkInThisWindow:
- if (d->view && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
setUrl(d->view->lastContextMenuRequest()->filteredLinkUrl());
break;
case OpenLinkInNewWindow:
- if (d->view && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
d->createNewWindow(WebContentsAdapterClient::NewWindowDisposition, true,
d->view->lastContextMenuRequest()->filteredLinkUrl());
break;
case OpenLinkInNewTab:
- if (d->view && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
d->createNewWindow(WebContentsAdapterClient::NewForegroundTabDisposition, true,
d->view->lastContextMenuRequest()->filteredLinkUrl());
break;
case OpenLinkInNewBackgroundTab:
- if (d->view && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
d->createNewWindow(WebContentsAdapterClient::NewBackgroundTabDisposition, true,
d->view->lastContextMenuRequest()->filteredLinkUrl());
break;
case CopyLinkToClipboard:
- if (d->view && !d->view->lastContextMenuRequest()->linkUrl().isEmpty()) {
+ if (d->view && d->view->lastContextMenuRequest() && !d->view->lastContextMenuRequest()->linkUrl().isEmpty()) {
QString urlString = d->view->lastContextMenuRequest()->linkUrl().toString(
QUrl::FullyEncoded);
QString linkText = d->view->lastContextMenuRequest()->linkText().toHtmlEscaped();
@@ -1322,7 +1322,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
}
break;
case DownloadLinkToDisk:
- if (d->view && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->filteredLinkUrl().isValid())
d->adapter->download(d->view->lastContextMenuRequest()->filteredLinkUrl(),
d->view->lastContextMenuRequest()->suggestedFileName(),
d->view->lastContextMenuRequest()->referrerUrl(),
@@ -1330,7 +1330,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
break;
case CopyImageToClipboard:
- if (d->view && d->view->lastContextMenuRequest()->hasImageContent()
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->hasImageContent()
&& (d->view->lastContextMenuRequest()->mediaType()
== QWebEngineContextMenuRequest::MediaTypeImage
|| d->view->lastContextMenuRequest()->mediaType()
@@ -1339,7 +1339,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
}
break;
case CopyImageUrlToClipboard:
- if (d->view && d->view->lastContextMenuRequest()->mediaUrl().isValid()
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->mediaUrl().isValid()
&& d->view->lastContextMenuRequest()->mediaType()
== QWebEngineContextMenuRequest::MediaTypeImage) {
QString urlString =
@@ -1360,14 +1360,14 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
break;
case DownloadImageToDisk:
case DownloadMediaToDisk:
- if (d->view && d->view->lastContextMenuRequest()->mediaUrl().isValid())
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->mediaUrl().isValid())
d->adapter->download(d->view->lastContextMenuRequest()->mediaUrl(),
d->view->lastContextMenuRequest()->suggestedFileName(),
d->view->lastContextMenuRequest()->referrerUrl(),
d->view->lastContextMenuRequest()->referrerPolicy());
break;
case CopyMediaUrlToClipboard:
- if (d->view && d->view->lastContextMenuRequest()->mediaUrl().isValid()
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->mediaUrl().isValid()
&& (d->view->lastContextMenuRequest()->mediaType()
== QWebEngineContextMenuRequest::MediaTypeAudio
|| d->view->lastContextMenuRequest()->mediaType()
@@ -1391,7 +1391,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
}
break;
case ToggleMediaControls:
- if (d->view && d->view->lastContextMenuRequest()->mediaUrl().isValid()
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->mediaUrl().isValid()
&& d->view->lastContextMenuRequest()->mediaFlags()
& QWebEngineContextMenuRequest::MediaCanToggleControls) {
bool enable = !(d->view->lastContextMenuRequest()->mediaFlags()
@@ -1401,7 +1401,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
}
break;
case ToggleMediaLoop:
- if (d->view && d->view->lastContextMenuRequest()->mediaUrl().isValid()
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->mediaUrl().isValid()
&& (d->view->lastContextMenuRequest()->mediaType()
== QWebEngineContextMenuRequest::MediaTypeAudio
|| d->view->lastContextMenuRequest()->mediaType()
@@ -1413,7 +1413,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
}
break;
case ToggleMediaPlayPause:
- if (d->view && d->view->lastContextMenuRequest()->mediaUrl().isValid()
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->mediaUrl().isValid()
&& (d->view->lastContextMenuRequest()->mediaType()
== QWebEngineContextMenuRequest::MediaTypeAudio
|| d->view->lastContextMenuRequest()->mediaType()
@@ -1425,7 +1425,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
}
break;
case ToggleMediaMute:
- if (d->view && d->view->lastContextMenuRequest()->mediaUrl().isValid()
+ if (d->view && d->view->lastContextMenuRequest() && d->view->lastContextMenuRequest()->mediaUrl().isValid()
&& d->view->lastContextMenuRequest()->mediaFlags()
& QWebEngineContextMenuRequest::MediaHasAudio) {
// Make sure to negate the value, so that toggling actually works.
@@ -1436,7 +1436,7 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
}
break;
case InspectElement:
- if (d->view)
+ if (d->view && d->view->lastContextMenuRequest())
d->adapter->inspectElementAt(d->view->lastContextMenuRequest()->position());
break;
case ExitFullScreen: