AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xcb: avoid to use invalid pointers

Browse Source 
Pick-to: 6.2 5.15 5.12
Task-number: QTBUG-96399
Change-Id: I33909940b501cb13f78981c43f3aef9fc9d1d52d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Liang Qi 2021-10-21 19:38:43 +02:00
parent 606124c5cc
commit e0938223c4
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -870,7 +870,13 @@ xcb_timestamp_t QXcbConnection::getTimestamp()
xcb_window_t QXcbConnection::getSelectionOwner(xcb_atom_t atom) const
{
return Q_XCB_REPLY(xcb_get_selection_owner, xcb_connection(), atom)->owner;
auto reply = Q_XCB_REPLY(xcb_get_selection_owner, xcb_connection(), atom);
if (!reply) {
qCDebug(lcQpaXcb) << "failed to query selection owner";
return XCB_NONE;
}
return reply->owner;
}
xcb_window_t QXcbConnection::getQtSelectionOwner()

8
src/plugins/platforms/xcb/qxcbconnection_basic.cpp
View File

@ -176,7 +176,13 @@ xcb_atom_t QXcbBasicConnection::internAtom(const char *name)
if (!name || *name == 0)
return XCB_NONE;
return Q_XCB_REPLY(xcb_intern_atom, m_xcbConnection, false, strlen(name), name)->atom;
auto reply = Q_XCB_REPLY(xcb_intern_atom, m_xcbConnection, false, strlen(name), name);
if (!reply) {
qCDebug(lcQpaXcb) << "failed to query intern atom: " << name;
return XCB_NONE;
}
return reply->atom;
}
QByteArray QXcbBasicConnection::atomName(xcb_atom_t atom)