blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Crashed when get windowicon

Browse Source 
Add a check when `buf` is nullptr to avoid exit.
  TODO: I don't know why.
This commit is contained in:
YeShanShan 2023-03-28 16:47:12 +08:00 committed by yeshanshan
parent 0e6489a502
commit 86442d813f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/dock/windowinfox.cpp
View File

@ -367,16 +367,24 @@ QString WindowInfoX::getIconFromWindow()
Atom net_wm_icon = XCB->getAtom("_NET_WM_ICON"); Atom net_wm_icon = XCB->getAtom("_NET_WM_ICON");
unsigned char *buf; unsigned char *buf = nullptr;
int format; int format;
Atom type; Atom type;
unsigned long nitems, bytes; unsigned long nitems, bytes;
// Get image size // Get image size
XGetWindowProperty(dpy, xid, net_wm_icon, 0, 1, 0, AnyPropertyType, &type, &format, &nitems, &bytes, &buf); XGetWindowProperty(dpy, xid, net_wm_icon, 0, 1, 0, AnyPropertyType, &type, &format, &nitems, &bytes, &buf);
if (!buf) {
qWarning() << "Failed to get width for window icon, window id:" << xid;
return QString();
}
int width = *(int *)buf; int width = *(int *)buf;
XFree(buf); XFree(buf);
XGetWindowProperty(dpy, xid, net_wm_icon, 1, 1, 0, AnyPropertyType, &type, &format, &nitems, &bytes, &buf); XGetWindowProperty(dpy, xid, net_wm_icon, 1, 1, 0, AnyPropertyType, &type, &format, &nitems, &bytes, &buf);
if (!buf) {
qWarning() << "Failed to get height for window icon, window id:" << xid;
return QString();
}
int height = *(int *)buf; int height = *(int *)buf;
XFree(buf); XFree(buf);