Kaydet (Commit) 9be7991d authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Don't crash if the BSTR pointer in a VARIANT is (weirdly) null

Change-Id: I8473b1f411a45c7c17e742ca0d69245d77f078f7
üst ad7302b5
......@@ -420,8 +420,11 @@ inline std::basic_ostream<charT, traits>& operator<<(std::basic_ostream<charT, t
stream << static_cast<double>(rVariant.date);
break; // FIXME
case VT_BSTR:
stream << std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t>().to_bytes(
rVariant.bstrVal);
if (rVariant.bstrVal == nullptr)
stream << "(null)";
else
stream << std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t>().to_bytes(
rVariant.bstrVal));
break;
case VT_DISPATCH:
stream << rVariant.pdispVal;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment