[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: Re: Review Request: Fix for KWord crash when ending not started
From: "Thomas Zander" <zander () kde ! org>
Date: 2010-08-27 13:27:45
Message-ID: 20100827132745.16526.94936 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://reviewboard.kde.org/r/5152/#review7242
-----------------------------------------------------------
Hey, cool fix, thanks!
The patch was for one hunk, you supplied 3. I like the one that fixes the b=
ug you write about the patch needs a bit more work.
Could you update the patch with these fixes? Then it can be committed as fa=
r as I can see :)
/trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp
<http://reviewboard.kde.org/r/5152/#comment7354>
This looks wrong, the code below expects the uniqID to become zero.
/trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp
<http://reviewboard.kde.org/r/5152/#comment7355>
If you want to follow coding style then you should have the closing bra=
ce on the same line as the else;
if (foo) {
} else {
}
/trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp
<http://reviewboard.kde.org/r/5152/#comment7356>
Good catch; this is indeed a correct fix. Could you also add a =
kWarning(32500) << "some message"
to make clear that we recovered from a broken input file?
- Thomas
On 2010-08-26 09:12:32, Miroslav Nohaj wrote:
> =
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://reviewboard.kde.org/r/5152/
> -----------------------------------------------------------
> =
> (Updated 2010-08-26 09:12:32)
> =
> =
> Review request for KOffice.
> =
> =
> Summary
> -------
> =
> This small fix just handles the situation when there's a request to finis=
h a bookmark which was not started (i.e. in some strange document). Does no=
thing special - just checks if really got the pointer to bookmark (and not =
null).
> =
> =
> Diffs
> -----
> =
> /trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp 1167253 =
> =
> Diff: http://reviewboard.kde.org/r/5152/diff
> =
> =
> Testing
> -------
> =
> =
> Thanks,
> =
> Miroslav
> =
>
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://reviewboard.kde.org/r/5152/">http://reviewboard.kde.org/r/5152/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Hey, cool fix, thanks!
The patch was for one hunk, you supplied 3. I like the one that fixes the bug you \
write about the patch needs a bit more work. Could you update the patch with these \
fixes? Then it can be committed as far as I can see :)</pre> <br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="/r/5152/diff/1/?file=34653#file34653line835" style="color: black; font-weight: \
bold; text-decoration: \
underline;">/trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
">QString KoTextLoader::createUniqueBookmarkName(KoBookmarkManager* bmm, QString \
bookmarkName, bool isEndMarker)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">835</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="k">if</span> <span class="p">(</span><span class="n">uniqID</span> <span \
class="o">></span> <span class="mi">0</span><span class="p">)</span> <span \
class="p">{</span> <span class="c1">// don't go to negative \
indexes</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This looks \
wrong, the code below expects the uniqID to become zero.</pre> </div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="/r/5152/diff/1/?file=34653#file34653line1016" style="color: black; font-weight: \
bold; text-decoration: \
underline;">/trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void \
KoTextLoader::loadSpan(const KoXmlElement &element, QTextCursor &cursor, bool \
*stripLeadingSpace)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1016</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="p">}</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">If you want \
to follow coding style then you should have the closing brace on the same line as the \
else; if (foo) {
} else {
}</pre>
</div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="/r/5152/diff/1/?file=34653#file34653line1032" style="color: black; font-weight: \
bold; text-decoration: \
underline;">/trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void \
KoTextLoader::loadSpan(const KoXmlElement &element, QTextCursor &cursor, bool \
*stripLeadingSpace)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">1032</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="k">if</span> <span class="p">(</span><span \
class="n">startBookmark</span><span class="p">)</span> <span class="p">{</span> \
<span class="c1">// set end bookmark only if we got start bookmark (we might not have \
in case of broken document)</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Good catch; \
this is indeed a correct fix. Could you also add a kWarning(32500) << \
"some message" to make clear that we recovered from a broken input \
file?</pre> </div>
<br />
<p>- Thomas</p>
<br />
<p>On August 26th, 2010, 9:12 a.m., Miroslav Nohaj wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://reviewboard.kde.orgrb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for KOffice.</div>
<div>By Miroslav Nohaj.</div>
<p style="color: grey;"><i>Updated 2010-08-26 09:12:32</i></p>
<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;">This small fix just handles the situation when there's a request to \
finish a bookmark which was not started (i.e. in some strange document). Does nothing \
special - just checks if really got the pointer to bookmark (and not null).</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>/trunk/koffice/libs/kotext/opendocument/KoTextLoader.cpp <span style="color: \
grey">(1167253)</span></li>
</ul>
<p><a href="http://reviewboard.kde.org/r/5152/diff/" style="margin-left: 3em;">View \
Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic