<!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>[20667] S60/branches/3.1m/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20667">20667</a></dd>
<dt>Author</dt> <dd>zbujtas</dd>
<dt>Date</dt> <dd>2007-04-02 13:38:53 -0700 (Mon, 02 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-03-30 jadhan <jade.han@nokia.com>
Reviewed by Zalan <zbujtas@gmail.com>
DESC: special handling for utf8 encoding of danish character. Merged fix from 3.2 to 3.1
http://bugs.webkit.org/show_bug.cgi?id=13231
WARNING: NO TEST CASES ADDED OR CHANGED
* ChangeLog:
* kwq/KWQTextCodec.cpp:
(validateUtf8):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60branches31mWebCoreChangeLog">S60/branches/3.1m/WebCore/ChangeLog</a></li>
<li><a href="#S60branches31mWebCorekwqKWQTextCodeccpp">S60/branches/3.1m/WebCore/kwq/KWQTextCodec.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60branches31mWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebCore/ChangeLog (20666 => 20667)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebCore/ChangeLog 2007-04-02 19:46:59 UTC (rev 20666)
+++ S60/branches/3.1m/WebCore/ChangeLog 2007-04-02 20:38:53 UTC (rev 20667)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-03-30 jadhan <jade.han@nokia.com>
+
+ Reviewed by Zalan <zbujtas@gmail.com>
+ DESC: special handling for utf8 encoding of danish character. Merged fix from 3.2 to 3.1
+ http://bugs.webkit.org/show_bug.cgi?id=13231
+
+ WARNING: NO TEST CASES ADDED OR CHANGED
+
+ * ChangeLog:
+ * kwq/KWQTextCodec.cpp:
+ (validateUtf8):
+
</ins><span class="cx"> 2007-04-02 yongjzha <yonjun.zhang@nokia.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by bjutas@gmail.com.
</span></span></pre></div>
<a id="S60branches31mWebCorekwqKWQTextCodeccpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebCore/kwq/KWQTextCodec.cpp (20666 => 20667)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebCore/kwq/KWQTextCodec.cpp 2007-04-02 19:46:59 UTC (rev 20666)
+++ S60/branches/3.1m/WebCore/kwq/KWQTextCodec.cpp 2007-04-02 20:38:53 UTC (rev 20667)
</span><span class="lines">@@ -105,17 +105,23 @@
</span><span class="cx"> const char* c = b;
</span><span class="cx"> int seqRem=0;
</span><span class="cx"> bool isUtf8 = true;
</span><ins>+ bool wrongUtf8 = false;
</ins><span class="cx"> validMultiByteChars = 0;
</span><span class="cx"> while (c<e)
</span><span class="cx"> {
</span><ins>+ if( seqRem == 0 )
+ b = c;
</ins><span class="cx"> // test validity of a multibyte sequence
</span><span class="cx"> if (seqRem>0) {
</span><span class="cx"> // a byte in sequence must match 10xxxxxx
</span><span class="cx"> if ((*c & 0xc0) == 0x80)
</span><span class="cx"> seqRem--;
</span><span class="cx"> else {
</span><del>- isUtf8 = false;
- break;
</del><ins>+ //Some times, there is wrong UTF-8 encoding in the characters.
+ //For example ( 0xd8 0x73). Then allow at least one byte wrong encoding.
+ //This has been found in the real site. Also, this means here that is an
+ //ASCII character. ASCII can be handled in the UTF-8 also.
+ wrongUtf8 = true;
</ins><span class="cx"> }
</span><span class="cx"> if (seqRem==0)
</span><span class="cx"> validMultiByteChars++;
</span><span class="lines">@@ -136,8 +142,18 @@
</span><span class="cx"> isUtf8 = false;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ if ( wrongUtf8 ){
+ if( seqRem == 1 ){
+ seqRem--;
+ wrongUtf8 = false;
+ }
+ else {
+ isUtf8 = false;
+ break;
+ }
+ } //end if ( wrongUtf8 )
</ins><span class="cx"> c++;
</span><del>- }
</del><ins>+ } //end while
</ins><span class="cx"> return isUtf8;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>