<!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>[19942] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/19942">19942</a></dd>
<dt>Author</dt> <dd>hyatt</dd>
<dt>Date</dt> <dd>2007-03-02 01:39:34 -0800 (Fri, 02 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix glyph map crasher.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformwinGlyphPageTreeNodeWincpp">trunk/WebCore/platform/win/GlyphPageTreeNodeWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (19941 => 19942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-03-02 08:22:45 UTC (rev 19941)
+++ trunk/WebCore/ChangeLog 2007-03-02 09:39:34 UTC (rev 19942)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2007-03-02 Dave Hyatt <hyatt@apple.com>
+
+ Fix crasher in glyph map code (buffer overrun).
+
+ Reviewed by darin
+
+ * platform/win/GlyphPageTreeNodeWin.cpp:
+ (WebCore::GlyphPage::fill):
+
</ins><span class="cx"> 2007-03-01 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Maciej.
</span></span></pre></div>
<a id="trunkWebCoreplatformwinGlyphPageTreeNodeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/win/GlyphPageTreeNodeWin.cpp (19941 => 19942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/win/GlyphPageTreeNodeWin.cpp 2007-03-02 08:22:45 UTC (rev 19941)
+++ trunk/WebCore/platform/win/GlyphPageTreeNodeWin.cpp 2007-03-02 09:39:34 UTC (rev 19942)
</span><span class="lines">@@ -43,13 +43,17 @@
</span><span class="cx">
</span><span class="cx"> TEXTMETRIC tm;
</span><span class="cx"> GetTextMetrics(dc, &tm);
</span><del>- WORD localGlyphBuffer[GlyphPage::size];
- GetGlyphIndices(dc, buffer, bufferLength, localGlyphBuffer, 0);
- for (unsigned i = 0; i < GlyphPage::size; i++)
- setGlyphDataForIndex(i, localGlyphBuffer[i], fontData);
</del><ins>+ WORD localGlyphBuffer[GlyphPage::size * 2];
+ DWORD result = GetGlyphIndices(dc, buffer, bufferLength, localGlyphBuffer, 0);
+ bool success = result != GDI_ERROR && (unsigned)result == bufferLength;
+ if (success) {
+ for (unsigned i = 0; i < GlyphPage::size; i++)
+ setGlyphDataForIndex(i, localGlyphBuffer[i], fontData);
+ }
</ins><span class="cx"> RestoreDC(dc, -1);
</span><span class="cx"> ReleaseDC(0, dc);
</span><del>- return true;
</del><ins>+ return success;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>