Browse Source

Fix HGLOBAL leak in plClipboard

Adam Johnson 11 years ago
parent
commit
febc871e52
  1. 12
      Sources/Plasma/PubUtilLib/plClipboard/plClipboard.cpp

12
Sources/Plasma/PubUtilLib/plClipboard/plClipboard.cpp

@ -43,6 +43,8 @@ Mead, WA 99021
#include "plClipboard.h" #include "plClipboard.h"
#include "hsWindows.h" #include "hsWindows.h"
#include <memory>
plClipboard& plClipboard::GetInstance() plClipboard& plClipboard::GetInstance()
{ {
static plClipboard theInstance; static plClipboard theInstance;
@ -93,8 +95,8 @@ void plClipboard::SetClipboardText(const plString& text)
if (len == 0) if (len == 0)
return; return;
HGLOBAL copy = ::GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(wchar_t)); std::unique_ptr<void, HGLOBAL(WINAPI*)(HGLOBAL)> copy(::GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(wchar_t)), ::GlobalFree);
if (copy == NULL) if (!copy)
return; return;
if (!::OpenClipboard(NULL)) if (!::OpenClipboard(NULL))
@ -102,12 +104,12 @@ void plClipboard::SetClipboardText(const plString& text)
::EmptyClipboard(); ::EmptyClipboard();
wchar_t* target = (wchar_t*)::GlobalLock(copy); wchar_t* target = (wchar_t*)::GlobalLock(copy.get());
memcpy(target, buf.GetData(), (len + 1) * sizeof(wchar_t)); memcpy(target, buf.GetData(), (len + 1) * sizeof(wchar_t));
target[len] = '\0'; target[len] = '\0';
::GlobalUnlock(copy); ::GlobalUnlock(copy.get());
::SetClipboardData(CF_UNICODETEXT, copy); ::SetClipboardData(CF_UNICODETEXT, copy.get());
::CloseClipboard(); ::CloseClipboard();
#endif #endif
} }

Loading…
Cancel
Save