diff options
| author | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 22:25:51 +0000 |
|---|---|---|
| committer | jennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 22:25:51 +0000 |
| commit | 60ea5d4efec3cefa00bcb87435358e9018ec688c (patch) | |
| tree | e21713315273510cc3aaa998e1d846213c998fa9 /webkit/appcache | |
| parent | 2dc0dcd755fa2d8955cc54ad8e8302be663431b4 (diff) | |
| download | chromium_src-60ea5d4efec3cefa00bcb87435358e9018ec688c.zip chromium_src-60ea5d4efec3cefa00bcb87435358e9018ec688c.tar.gz chromium_src-60ea5d4efec3cefa00bcb87435358e9018ec688c.tar.bz2 | |
Fix to avoid a bad mem access after URL request has already been deleted.
Re-enabled tests that may trigger this condition.
TEST=no new tests
BUG=none
Review URL: http://codereview.chromium.org/285006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
| -rw-r--r-- | webkit/appcache/appcache_update_job.cc | 3 | ||||
| -rw-r--r-- | webkit/appcache/appcache_update_job_unittest.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc index 46048b5..a775461 100644 --- a/webkit/appcache/appcache_update_job.cc +++ b/webkit/appcache/appcache_update_job.cc @@ -159,7 +159,8 @@ void AppCacheUpdateJob::OnResponseStarted(URLRequest *request) { } void AppCacheUpdateJob::ReadResponseData(URLRequest* request) { - if (internal_state_ == CACHE_FAILURE || internal_state_ == CANCELLED) + if (internal_state_ == CACHE_FAILURE || internal_state_ == CANCELLED + || internal_state_ == COMPLETED) return; int bytes_read = 0; diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc index c74b1f0..be1d716 100644 --- a/webkit/appcache/appcache_update_job_unittest.cc +++ b/webkit/appcache/appcache_update_job_unittest.cc @@ -1422,11 +1422,11 @@ TEST_F(AppCacheUpdateJobTest, UpgradeSuccessMergedTypes) { RunTestOnIOThread(&AppCacheUpdateJobTest::UpgradeSuccessMergedTypesTest); } -TEST_F(AppCacheUpdateJobTest, DISABLED_CacheAttemptFailUrlFetch) { +TEST_F(AppCacheUpdateJobTest, CacheAttemptFailUrlFetch) { RunTestOnIOThread(&AppCacheUpdateJobTest::CacheAttemptFailUrlFetchTest); } -TEST_F(AppCacheUpdateJobTest, DISABLED_UpgradeFailUrlFetch) { +TEST_F(AppCacheUpdateJobTest, UpgradeFailUrlFetch) { RunTestOnIOThread(&AppCacheUpdateJobTest::UpgradeFailUrlFetchTest); } |