[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Review Request 124877: fix corruption of startupconfig(files) in Qt5.6
From: "Takahiro Hashimoto" <kenya888 () gmail ! com>
Date: 2015-08-31 17:24:20
Message-ID: 20150831172420.10622.24083 () mimi ! kde ! org
[Download RAW message or body]
--===============1723002599045350654==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
> On 9月 1, 2015, 2 a.m., Aleix Pol Gonzalez wrote:
> > To be honest, I don't see how this should make a difference...
I'm sorry for lacking of my explanation...
Please see the difference of QString::fromLocal8Bit(const QByteArray &str) \
implementation between Qt 5.5 and 5.6
(5.5) http://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/tools/qstring.h?h=5.5#n541
(5.6) http://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/tools/qstring.h#n545
QString::fromLocal8Bit(const QByteArray &str) no longer use qstrlen() so that the \
padding data in QByteArray is included in the return value. It's the root cause of \
this problem.
If we want to use QString::fromLocal8Bit() with QByteArray excluding padding data \
with Qt 5.6, we can use inline function QString::fromLocal8Bit(const char *str, int \
size = -1)
http://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/tools/qstring.h#n536
I don't know the clear reason for the text buffer in kdostartupconfig being \
initialized with 1024bytes. But I think my patch is the smallest change to avoid the \
side effects.
- Takahiro
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124877/#review84659
-----------------------------------------------------------
On 9月 1, 2015, 1:33 a.m., Takahiro Hashimoto wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/124877/
> -----------------------------------------------------------
>
> (Updated 9月 1, 2015, 1:33 a.m.)
>
>
> Review request for Plasma.
>
>
> Bugs: 351609
> https://bugs.kde.org/show_bug.cgi?id=351609
>
>
> Repository: plasma-workspace
>
>
> Description
> -------
>
> Building Plasma5 with Qt 5.6 branch, kstartupconfig5/kdostartupconfig5 generates \
> corrupted files.
> $HOME/.config/startupconfigfiles
> $HOME/.config/startupconfig
>
>
> Diffs
> -----
>
> startkde/kstartupconfig/kdostartupconfig.cpp 3944c06
>
> Diff: https://git.reviewboard.kde.org/r/124877/diff/
>
>
> Testing
> -------
>
> works for me.
>
> 1. execute kstartupconfig5
> 2. check if both files are not corrupted.
>
>
> Thanks,
>
> Takahiro Hashimoto
>
>
--===============1723002599045350654==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/124877/">https://git.reviewboard.kde.org/r/124877/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On 9月 1st, 2015, 2 a.m. JST, <b>Aleix Pol \
Gonzalez</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;"> <pre style="white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">To be honest, I don't see how this should make a \
difference...</p></pre> </blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I'm \
sorry for lacking of my explanation...</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">Please see the \
difference of QString::fromLocal8Bit(const QByteArray &str) implementation \
between Qt 5.5 and 5.6</p> <p style="padding: 0;text-rendering: inherit;margin: \
0;line-height: inherit;white-space: inherit;">(5.5) \
http://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/tools/qstring.h?h=5.5#n541 \
(5.6) http://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/tools/qstring.h#n545</p> \
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">QString::fromLocal8Bit(const QByteArray &str) no \
longer use qstrlen() so that the padding data in QByteArray is included in the return \
value. It's the root cause of this problem.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">If we want to use \
QString::fromLocal8Bit() with QByteArray excluding padding data with Qt 5.6, we can \
use inline function QString::fromLocal8Bit(const char *str, int size = -1)</p> <p \
style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: \
inherit;">http://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/tools/qstring.h#n536</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">I don't know the clear reason for the text buffer in \
kdostartupconfig being initialized with 1024bytes. But I think my patch is the \
smallest change to avoid the side effects.</p></pre> <br />
<p>- Takahiro</p>
<br />
<p>On 9月 1st, 2015, 1:33 a.m. JST, Takahiro Hashimoto wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Plasma.</div>
<div>By Takahiro Hashimoto.</div>
<p style="color: grey;"><i>Updated 9月 1, 2015, 1:33 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="https://bugs.kde.org/show_bug.cgi?id=351609">351609</a>
</div>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-workspace
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Building Plasma5 with Qt 5.6 branch, kstartupconfig5/kdostartupconfig5 \
generates corrupted files.
$HOME/.config/startupconfigfiles
$HOME/.config/startupconfig</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">works for me. </p> <ol style="padding: \
0;text-rendering: inherit;margin: 0 0 0 2em;line-height: inherit;white-space: \
normal;"> <li style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: normal;">execute kstartupconfig5</li> <li style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">check \
if both files are not corrupted.</li> </ol></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>startkde/kstartupconfig/kdostartupconfig.cpp <span style="color: \
grey">(3944c06)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/124877/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============1723002599045350654==--
[Attachment #3 (text/plain)]
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic