diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
| commit | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch) | |
| tree | 529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/hw/xwin/winclipboardxevents.c | |
| parent | 13919cf85a6ca41d97238de13344aba59e0f7680 (diff) | |
| parent | 4c61bf84b11e26e6f22648668c95ea760a379163 (diff) | |
| download | vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2 vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winclipboardxevents.c')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardxevents.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c index d7fa8ffd7..a3d333d80 100644 --- a/xorg-server/hw/xwin/winclipboardxevents.c +++ b/xorg-server/hw/xwin/winclipboardxevents.c @@ -426,8 +426,7 @@ winClipboardFlushXEvents (HWND hwnd, xtpText.value = NULL;
xtpText.nitems = 0;
}
- if (pszConvertData)
- free (pszConvertData);
+ free(pszConvertData);
if (hGlobal && pszGlobalData)
GlobalUnlock (hGlobal);
@@ -792,10 +791,8 @@ winClipboardFlushXEvents (HWND hwnd, xtpText.value = NULL;
xtpText.nitems = 0;
}
- if (pszConvertData)
- free (pszConvertData);
- if (pwszUnicodeStr)
- free (pwszUnicodeStr);
+ free(pszConvertData);
+ free(pwszUnicodeStr);
if (hGlobal && pszGlobalData)
GlobalUnlock (hGlobal);
if (fSetClipboardData && g_fUnicodeSupport)
|