Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add better error checking to wxWebViewIE

Browse Source 
Verify that accessing a property really succeeded before using the returned
value.

This should fix at least one crash due to the use of uninitialized BSTR in
wxWebViewIE::GetCurrentTitle().

See #17204.

(this is a backport of 4489ec80e0 from master)
This commit is contained in:
Markus Juergens
2015-10-15 16:35:58 +02:00
committed by Vadim Zeitlin
parent 668be48b65
commit 56a3441663
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/msw/webview_ie.cpp
View File

@@ -281,8 +281,8 @@ wxString wxWebViewIE::GetPageSource() const
if(SUCCEEDED(hr))
{
BSTR bstr;
htmlTag->get_outerHTML(&bstr);
source = wxString(bstr);
if ( htmlTag->get_outerHTML(&bstr) == S_OK )
source = wxString(bstr);
}
}
return source;
@@ -622,16 +622,15 @@ wxString wxWebViewIE::GetCurrentTitle() const
{
wxCOMPtr<IHTMLDocument2> document(GetDocument());
wxString s;
if(document)
{
BSTR title;
document->get_nameProp(&title);
return wxString(title);
}
else
{
return "";
if ( document->get_nameProp(&title) == S_OK )
s = title;
}
return s;
}
bool wxWebViewIE::CanCut() const
@@ -756,16 +755,13 @@ bool wxWebViewIE::IsEditable() const
if(document)
{
BSTR mode;
document->get_designMode(&mode);
if(wxString(mode) == "On")
return true;
else
return false;
}
else
{
return false;
if ( document->get_designMode(&mode) == S_OK )
{
if ( wxString(mode) == "On" )
return true;
}
}
return false;
}
void wxWebViewIE::SelectAll()
@@ -785,8 +781,8 @@ bool wxWebViewIE::HasSelection() const
if(SUCCEEDED(hr))
{
BSTR type;
selection->get_type(&type);
sel = wxString(type);
if ( selection->get_type(&type) == S_OK )
sel = wxString(type);
}
return sel != "None";
}
@@ -821,8 +817,8 @@ wxString wxWebViewIE::GetSelectedText() const
if(SUCCEEDED(hr))
{
BSTR text;
range->get_text(&text);
selected = wxString(text);
if ( range->get_text(&text) == S_OK )
selected = wxString(text);
}
}
}
@@ -854,8 +850,8 @@ wxString wxWebViewIE::GetSelectedSource() const
if(SUCCEEDED(hr))
{
BSTR text;
range->get_htmlText(&text);
selected = wxString(text);
if ( range->get_htmlText(&text) == S_OK )
selected = wxString(text);
}
}
}
@@ -895,8 +891,8 @@ wxString wxWebViewIE::GetPageText() const
if(SUCCEEDED(hr))
{
BSTR out;
body->get_innerText(&out);
text = wxString(out);
if ( body->get_innerText(&out) == S_OK )
text = wxString(out);
}
return text;
}