diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 12:49:30 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 12:49:30 +0000 |
| commit | 7fb0d58958805925537b7f39b71f1bb9327bbfa7 (patch) | |
| tree | 530a8bceabe7bf094af91e78c3471595ca6626cd /chrome_frame/test | |
| parent | 2a3542f5b064e676cd5c21a90cbc92e9af06770b (diff) | |
| download | chromium_src-7fb0d58958805925537b7f39b71f1bb9327bbfa7.zip chromium_src-7fb0d58958805925537b7f39b71f1bb9327bbfa7.tar.gz chromium_src-7fb0d58958805925537b7f39b71f1bb9327bbfa7.tar.bz2 | |
Prevent redirector from returning the current module in cases where it fails to look up the first module in. This prevents a bug that can cause user-level Chrome Frame to redirect to itself when a system-level Chrome Frame is present.
BUG=96016
TEST=Upgrade a user-level CF install to a system-level CF install while user-level CF is rendering. Observe that the current explorer instance does not hang when new CF tabs are created.
Review URL: http://codereview.chromium.org/7866043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/dll_redirector_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/dll_redirector_test.cc b/chrome_frame/test/dll_redirector_test.cc index cfa9349..210c904 100644 --- a/chrome_frame/test/dll_redirector_test.cc +++ b/chrome_frame/test/dll_redirector_test.cc @@ -302,7 +302,7 @@ TEST_F(DllRedirectorTest, BadVersionNumber) { EXPECT_TRUE(first_redirector->RegisterAsFirstCFModule()); HMODULE first_module = first_redirector->GetFirstModule(); - EXPECT_EQ(reinterpret_cast<HMODULE>(&__ImageBase), first_module); + EXPECT_EQ(NULL, first_module); } // TODO(robertshield): These tests rely on simulating access checks from a low |