Vitaly Lipatov : winex11: Add check for XmbTextPropertyToTextList result.
Alexandre Julliard
julliard at winehq.org
Wed Dec 3 05:56:51 CST 2008
Module: wine
Branch: master
Commit: 934aa492b41a21dffd5b969a5d03e6138cd49186
URL: http://source.winehq.org/git/wine.git/?a=commit;h=934aa492b41a21dffd5b969a5d03e6138cd49186
Author: Vitaly Lipatov <lav at etersoft.ru>
Date: Mon Nov 24 23:06:40 2008 +0300
winex11: Add check for XmbTextPropertyToTextList result.
---
dlls/winex11.drv/clipboard.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index d50cf42..5577867 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -1224,7 +1224,7 @@ HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *display, Window w, Atom prop)
*/
static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, Atom prop)
{
- int i, j;
+ int i, j, ret;
char** srcstr;
int count, lcount;
int srclen, destlen;
@@ -1239,9 +1239,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, At
txtprop.encoding = x11drv_atom(COMPOUND_TEXT);
txtprop.format = 8;
wine_tsx11_lock();
- XmbTextPropertyToTextList(display, &txtprop, &srcstr, &count);
+ ret = XmbTextPropertyToTextList(display, &txtprop, &srcstr, &count);
wine_tsx11_unlock();
HeapFree(GetProcessHeap(), 0, txtprop.value);
+ if (ret != Success || !count) return 0;
TRACE("Importing %d line(s)\n", count);
More information about the wine-cvs
mailing list