thooge
/
keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added safety check when retrieving the active window title for global auto-type 

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@207 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer 2008-06-24 17:05:24 +00:00
parent bc8ec1b520
commit 90d515f6e7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/AutoType_X11.cpp
View File

@ -170,20 +170,21 @@ void AutoType::performGlobal(){
Window w; Window w;
int revert_to_return; int revert_to_return;
XGetInputFocus(d, &w, &revert_to_return); XGetInputFocus(d, &w, &revert_to_return);
char** list; char** list = NULL;
int tree; int tree;
do { do {
XTextProperty textProp; XTextProperty textProp;
XGetWMName(d, w, &textProp); if (XGetWMName(d, w, &textProp) != 0) {
int count; int count;
Xutf8TextPropertyToTextList(d, &textProp, &list, &count); if (Xutf8TextPropertyToTextList(d, &textProp, &list, &count)<0) return;
if (list) break; if (list) break;
}
Window root = 0; Window root = 0;
Window parent = 0; Window parent = 0;
Window* children = NULL; Window* children = NULL;
unsigned int num_children; unsigned int num_children;
tree = XQueryTree(d, w, &root, &parent, &children, &num_children); tree = XQueryTree(d, w, &root, &parent, &children, &num_children);
w=parent; w = parent;
if (children) XFree(children); if (children) XFree(children);
} while (tree && w); } while (tree && w);
if (!list) return; if (!list) return;