diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-07 16:13:31 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-07 16:13:31 +0000 |
| commit | e79f10f3a37828e770dc3cfdbc0aa84eb0a07c9d (patch) | |
| tree | db108c4df95c7c4f1f10d9b31d3a2b68462d8360 /chrome/browser/icon_manager.h | |
| parent | 65fabb5884a6087fb01030269ae8ee514191c1aa (diff) | |
| download | chromium_src-e79f10f3a37828e770dc3cfdbc0aa84eb0a07c9d.zip chromium_src-e79f10f3a37828e770dc3cfdbc0aa84eb0a07c9d.tar.gz chromium_src-e79f10f3a37828e770dc3cfdbc0aa84eb0a07c9d.tar.bz2 | |
Fix crash in the icon manager. The decoding could be NULL, which would then get
dereferenced in specific cases. We would have to create the failed icon twice,
so that it would think the icon was already in the cache, when in fact a NULL
value was being cached.
BUG=1259695
Review URL: http://codereview.chromium.org/9672
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_manager.h')
| -rw-r--r-- | chrome/browser/icon_manager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h index ad6a4eb..6840ac1 100644 --- a/chrome/browser/icon_manager.h +++ b/chrome/browser/icon_manager.h @@ -70,6 +70,8 @@ public: // work is done on the file thread, with the callbacks running on the UI // thread. The return value is the 'request_id' that will be passed to the // client in the callback. + // + // WATCH OUT: The returned bitmap pointer may be NULL if decoding failed. typedef CancelableRequestProvider::Handle Handle; typedef Callback2<Handle, SkBitmap*>::Type IconRequestCallback; |