diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 16:38:28 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 16:38:28 +0000 |
| commit | 1d74d249b20b182c1003d7630eab2a983040af15 (patch) | |
| tree | 44c39672a9faa50c403bb2fe2d7b400a7b48749d /app | |
| parent | a2ab7e5c836a8f36a4ce76e84b3002ed19bfb705 (diff) | |
| download | chromium_src-1d74d249b20b182c1003d7630eab2a983040af15.zip chromium_src-1d74d249b20b182c1003d7630eab2a983040af15.tar.gz chromium_src-1d74d249b20b182c1003d7630eab2a983040af15.tar.bz2 | |
Fix a crash that happens if we fail to mmap resources.pak.
The crash happens if mmap_ is null in DataPack so I just added some
null checks. Some features still won't work (inspector, bookmark
manager, about:net-internals, etc), but we shouldn't crash.
I'm going to write a follow up patch that brings up a dialog asking to reinstall
and check for quarantined files if resources.pak fails to load (kind of like the
dialog that comes up when the history db can't be loaded).
BUG=79252
TEST=covered by app_unittests
Review URL: http://codereview.chromium.org/6835034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/app.gyp b/app/app.gyp index 1810938..b7b9aaa 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -40,6 +40,7 @@ '../ui/base/models/tree_node_iterator_unittest.cc', '../ui/base/models/tree_node_model_unittest.cc', '../ui/base/resource/data_pack_unittest.cc', + '../ui/base/resource/resource_bundle_unittest.cc', '../ui/base/system_monitor/system_monitor_unittest.cc', '../ui/base/test/data/resource.h', '../ui/base/text/text_elider_unittest.cc', |