[vlc-commits] activex: vlccontrol: Fix potential crash

[Hugo Beauzée-Luyssen]

npapi-vlc | branch: cleanup | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Apr 17 15:25:32 2015 +0200| [aae47747f088cf120d2cd9571341e5b3a88a7341] | committer: Hugo Beauzée-Luyssen

activex: vlccontrol: Fix potential crash

Fix cid #59956

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=aae47747f088cf120d2cd9571341e5b3a88a7341
---

 activex/vlccontrol2.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/activex/vlccontrol2.cpp b/activex/vlccontrol2.cpp
index 2de53d3..e24e1eb 100644
--- a/activex/vlccontrol2.cpp
+++ b/activex/vlccontrol2.cpp
@@ -669,6 +669,8 @@ STDMETHODIMP VLCMarquee::get_text(BSTR *val)
 STDMETHODIMP VLCMarquee::put_text(BSTR val)
 {
     char *psz_text = CStrFromBSTR(CP_UTF8, val);
+    if ( psz_text == nullptr )
+        return E_OUTOFMEMORY;
     _plug->get_player().get_mp().setMarqueeString( libvlc_marquee_Text, psz_text );
     CoTaskMemFree(psz_text);
     return S_OK;