<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[24825] S60/branches/3.1m/MemoryManager</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24825">24825</a></dd>
<dt>Author</dt> <dd>yongjzha</dd>
<dt>Date</dt> <dd>2007-08-02 07:08:32 -0700 (Thu, 02 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-08-01 vmalaiya, <vikram.malaiya@nokia.com>
Reviewed by Yongjun
DESC: - Added error check in case an attempt to commit memory fails.
TSW Id - SKAR-74YPNV
http://bugs.webkit.org/show_bug.cgi?id=14844
* Src/fast_malloc.cpp:
(chunkMoreCore):
(symbian_mmap):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60branches31mMemoryManagerChangeLog">S60/branches/3.1m/MemoryManager/ChangeLog</a></li>
<li><a href="#S60branches31mMemoryManagerSrcfast_malloccpp">S60/branches/3.1m/MemoryManager/Src/fast_malloc.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60branches31mMemoryManagerChangeLog"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/MemoryManager/ChangeLog (24824 => 24825)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/MemoryManager/ChangeLog 2007-08-02 14:02:49 UTC (rev 24824)
+++ S60/branches/3.1m/MemoryManager/ChangeLog 2007-08-02 14:08:32 UTC (rev 24825)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2007-08-01 vmalaiya, <vikram.malaiya@nokia.com>
+ Reviewed by Yongjun
+ DESC: - Added error check in case an attempt to commit memory fails.
+ TSW Id - SKAR-74YPNV
+ http://bugs.webkit.org/show_bug.cgi?id=14844
+
+ * Src/fast_malloc.cpp:
+ (chunkMoreCore):
+ (symbian_mmap):
+
</ins><span class="cx"> 2007-06-29 yongjzha <yongjun.zhang@nokia.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Zalan.
</span></span></pre></div>
<a id="S60branches31mMemoryManagerSrcfast_malloccpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/MemoryManager/Src/fast_malloc.cpp (24824 => 24825)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/MemoryManager/Src/fast_malloc.cpp 2007-08-02 14:02:49 UTC (rev 24824)
+++ S60/branches/3.1m/MemoryManager/Src/fast_malloc.cpp 2007-08-02 14:08:32 UTC (rev 24825)
</span><span class="lines">@@ -4906,7 +4906,9 @@
</span><span class="cx"> if (rchunk.Commit((int)watermark-(int)rchunk.Base(), size) != KErrNone) {
</span><span class="cx"> release_rescue_buffer();
</span><span class="cx"> // try again
</span><del>- rchunk.Commit((int)watermark-(int)rchunk.Base(), size);
</del><ins>+ if (rchunk.Commit((int)watermark-(int)rchunk.Base(), size) != KErrNone) {
+ return CMFAIL;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> watermark = (void*)((int)watermark + size);
</span><span class="lines">@@ -4928,7 +4930,9 @@
</span><span class="cx"> if (rchunk.Commit((int)watermark-(int)rchunk.Base(), size) != KErrNone) {
</span><span class="cx"> release_rescue_buffer();
</span><span class="cx"> // try again
</span><del>- rchunk.Commit((int)watermark-(int)rchunk.Base(), size);
</del><ins>+ if (rchunk.Commit((int)watermark-(int)rchunk.Base(), size) != KErrNone) {
+ return CMFAIL;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* oldmark = watermark;
</span></span></pre>
</div>
</div>
</body>
</html>