Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
450
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
d1d0a507
Commit
d1d0a507
authored
2 months ago
by
Fatih Uzunoğlu
Committed by
Felix Paul Kühne
2 months ago
Browse files
Options
Downloads
Patches
Plain Diff
contrib: qtdeclarative: add patch to prevent null pointer dereference in QQuickPopup
parent
49874dfa
No related branches found
Branches containing commit
No related tags found
1 merge request
!6597
contrib: qtdeclarative: prevent null pointer dereference in QQuickPopup
Pipeline
#551957
passed with stage
in 48 minutes and 49 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/qtdeclarative/0001-Add-missing-null-pointer-check-in-QQuickPopup.patch
+33
-0
33 additions, 0 deletions
.../0001-Add-missing-null-pointer-check-in-QQuickPopup.patch
contrib/src/qtdeclarative/rules.mak
+1
-0
1 addition, 0 deletions
contrib/src/qtdeclarative/rules.mak
with
34 additions
and
0 deletions
contrib/src/qtdeclarative/0001-Add-missing-null-pointer-check-in-QQuickPopup.patch
0 → 100644
+
33
−
0
View file @
d1d0a507
From 4c1fb51e53f0df69684ea811080d7b9ab222cff1 Mon Sep 17 00:00:00 2001
From: Fatih Uzunoglu <fuzun54@outlook.com>
Date: Wed, 1 Jan 2025 17:16:13 +0200
Subject: [PATCH] Add missing null pointer check in QQuickPopup
Otherwise in certain circumstances this causes
null pointer dereference induced crash.
This is only relevant when the new Qt 6.8 feature
`popupType: Popup.Window` is used where it makes
it possible for Quick Popups to have their own
independent windows.
---
src/quicktemplates/qquickpopup.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/quicktemplates/qquickpopup.cpp b/src/quicktemplates/qquickpopup.cpp
index 85062f44fd..f85bcdd296 100644
--- a/src/quicktemplates/qquickpopup.cpp
+++ b/src/quicktemplates/qquickpopup.cpp
@@ -1104,7 +1104,8 @@
void QQuickPopupPrivate::adjustPopupItemParentAndWindow()
popupItem->setParentItem(popupWindow->contentItem());
popupItem->forceActiveFocus(Qt::PopupFocusReason);
}
- popupWindow->setVisible(visible);
+ if (popupWindow)
+ popupWindow->setVisible(visible);
} else {
if (visible) {
popupItem->setParentItem(overlay);
--
2.47.1
This diff is collapsed.
Click to expand it.
contrib/src/qtdeclarative/rules.mak
+
1
−
0
View file @
d1d0a507
...
...
@@ -35,6 +35,7 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
qtdeclarative
:
qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
$(
UNPACK
)
$(
APPLY
)
$(
SRC
)
/qtdeclarative/0001-Add-missing-disconnect-and-null-check-in-QQuickPopup.patch
$(
APPLY
)
$(
SRC
)
/qtdeclarative/0001-Add-missing-null-pointer-check-in-QQuickPopup.patch
# disable unused CLI tools: qml, qmleasing, qmldom, qmlformat, qmltc
sed
-i
.orig
-e
's,add_subdirectory(qml),#add_subdirectory(qml),'
$(
UNPACK_DIR
)
/tools/CMakeLists.txt
sed
-i
.orig
-e
's,add_subdirectory(qmleasing),#add_subdirectory(qmleasing),'
$(
UNPACK_DIR
)
/tools/CMakeLists.txt
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment