Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(732)

Side by Side Diff: webkit/glue/image_resource_fetcher.cc

Issue 6325012: Fix a potential crash by clearing callback_ before running it.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | webkit/glue/resource_fetcher.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/image_resource_fetcher.h" 5 #include "webkit/glue/image_resource_fetcher.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "gfx/size.h" 8 #include "gfx/size.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
10 #include "webkit/glue/image_decoder.h" 10 #include "webkit/glue/image_decoder.h"
(...skipping 29 matching lines...) Expand all
40 SkBitmap bitmap; 40 SkBitmap bitmap;
41 if (!response.isNull() && response.httpStatusCode() == 200) { 41 if (!response.isNull() && response.httpStatusCode() == 200) {
42 // Request succeeded, try to convert it to an image. 42 // Request succeeded, try to convert it to an image.
43 ImageDecoder decoder(gfx::Size(image_size_, image_size_)); 43 ImageDecoder decoder(gfx::Size(image_size_, image_size_));
44 bitmap = decoder.Decode( 44 bitmap = decoder.Decode(
45 reinterpret_cast<const unsigned char*>(data.data()), data.size()); 45 reinterpret_cast<const unsigned char*>(data.data()), data.size());
46 } // else case: 46 } // else case:
47 // If we get here, it means no image from server or couldn't decode the 47 // If we get here, it means no image from server or couldn't decode the
48 // response as an image. The delegate will see a null image, indicating 48 // response as an image. The delegate will see a null image, indicating
49 // that an error occurred. 49 // that an error occurred.
50 callback_->Run(this, bitmap); 50
51 callback_.reset(); 51 // Take care to clear callback_ before running the callback as it may lead to
52 // our destruction.
53 scoped_ptr<Callback> callback;
54 callback.swap(callback_);
55 callback->Run(this, bitmap);
52 } 56 }
53 57
54 } // namespace webkit_glue 58 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/resource_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698