summaryrefslogtreecommitdiffstats
path: root/ceee
diff options
context:
space:
mode:
authormad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 15:00:07 +0000
committermad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 15:00:07 +0000
commitb66ccb8caaad56e95a2d4f360e41dbd6bd2e887b (patch)
treed1810946fe9f1845e546bac6e2624715839c70df /ceee
parentbbbe9ad9d404edddefc06ebb745d41c3435751ab (diff)
downloadchromium_src-b66ccb8caaad56e95a2d4f360e41dbd6bd2e887b.zip
chromium_src-b66ccb8caaad56e95a2d4f360e41dbd6bd2e887b.tar.gz
chromium_src-b66ccb8caaad56e95a2d4f360e41dbd6bd2e887b.tar.bz2
Fix a crash.
There seems to be cases where there is an event with no type and get_type return a success code (probably S_FALSE, but I couldn't confirm it) and doesn't set the type string pointer return argument. BUG= 61900 TEST= Make sure we still get proper web progress notifications... Review URL: http://codereview.chromium.org/4444002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
-rw-r--r--ceee/ie/plugin/bho/web_progress_notifier.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceee/ie/plugin/bho/web_progress_notifier.cc b/ceee/ie/plugin/bho/web_progress_notifier.cc
index c32ac70..0cda051 100644
--- a/ceee/ie/plugin/bho/web_progress_notifier.cc
+++ b/ceee/ie/plugin/bho/web_progress_notifier.cc
@@ -449,7 +449,8 @@ bool WebProgressNotifier::InOnLoadEvent(IWebBrowser2* browser) {
return false;
CComBSTR type;
- if (FAILED(event_obj->get_type(&type)) || wcscmp(type, L"load") != 0)
+ if (FAILED(event_obj->get_type(&type)) ||
+ wcscmp(com::ToString(type), L"load") != 0)
return false;
else
return true;