'[webkit-changes] [133043] branches/chromium/1312/Source/WebCore/Modules/indexeddb/'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [133043] branches/chromium/1312/Source/WebCore/Modules/indexeddb/
From:       jsbell () chromium ! org
Date:       2012-10-31 17:21:36
Message-ID: 20121031172136.81E43301227 () svn ! webkit ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133043] branches/chromium/1312/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp</title>
 </head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt;  } #msg dl a { font-weight: \
bold} #msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
 #patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
                .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/133043">133043</a></dd> \
<dt>Author</dt> <dd>jsbell@chromium.org</dd> <dt>Date</dt> <dd>2012-10-31 10:21:36 \
-0700 (Wed, 31 Oct 2012)</dd> </dl>

<h3>Log Message</h3>
<pre>Merge 132848 - IndexedDB: Crash on checking version of corrupt backing store
https://bugs.webkit.org/show_bug.cgi?id=100692

Reviewed by Tony Chang.

If the backing store fails to open (due to corruption, non-writeable disk, etc)
the subsequent schema version check dereferences a null pointer. Fix to only
do the schema check if the database opened.

Chromium tests will be included with crrev.com/11196029

* Modules/indexeddb/IDBLevelDBBackingStore.cpp:
(WebCore::IDBLevelDBBackingStore::open):

TBR=jsbell@chromium.org
Review URL: https://codereview.chromium.org/11358013</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheschromium1312SourceWebCoreModulesindexeddbIDBLevelDBBackingStorec \
pp">branches/chromium/1312/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheschromium1312SourceWebCoreModulesindexeddbIDBLevelDBBackingStorecpp"></a>
 <div class="modfile"><h4>Modified: \
branches/chromium/1312/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp \
(133042 => 133043)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1312/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp	2012-10-31 \
                17:07:31 UTC (rev 133042)
+++ branches/chromium/1312/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp	2012-10-31 \
17:21:36 UTC (rev 133043) </span><span class="lines">@@ -295,13 +295,13 @@
</span><span class="cx">         String path = pathByAppendingComponent(pathBase, \
securityOrigin-&gt;databaseIdentifier() + &quot;.indexeddb.leveldb&quot;); \
</span><span class="cx">  </span><span class="cx">         db = \
LevelDBDatabase::open(path, comparator.get()); </span><del>-        bool knownSchema \
                = isSchemaKnown(db.get());
-        if (!knownSchema) {
</del><ins>+        if (db &amp;&amp; !isSchemaKnown(db.get())) {
</ins><span class="cx">             LOG_ERROR(&quot;IndexedDB backing store had \
unknown schema, treating it as failure to open&quot;); </span><span class="cx">       \
HistogramSupport::histogramEnumeration(&quot;WebCore.IndexedDB.BackingStore.OpenStatus&quot;, \
IDBLevelDBBackingStoreOpenFailedUnknownSchema, IDBLevelDBBackingStoreOpenMax); \
</span><ins>+            db.release(); </ins><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (db &amp;&amp; knownSchema)
</del><ins>+        if (db)
</ins><span class="cx">             \
HistogramSupport::histogramEnumeration(&quot;WebCore.IndexedDB.BackingStore.OpenStatus&quot;, \
IDBLevelDBBackingStoreOpenSuccess, IDBLevelDBBackingStoreOpenMax); </span><span \
class="cx">         else { </span><span class="cx">             \
LOG_ERROR(&quot;IndexedDB backing store open failed, attempting cleanup&quot;); \
</span></span></pre> </div>
</div>

</body>
</html>

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

[prev in list] [next in list] [prev in thread] [next in thread] 