[prev in list] [next in list] [prev in thread] [next in thread]
List: calligra-devel
Subject: Re: Review Request 110506: Ignore application of default styles in DockerStylesComboModel
From: "C. Boemann" <cbr () boemann ! dk>
Date: 2013-05-19 6:56:41
Message-ID: 20130519065641.5021.46855 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
> On May 19, 2013, 4:36 a.m., Thorsten Zachmann wrote:
> > plugins/textshape/dialogs/DockerStylesComboModel.cpp, lines 156-159
> > <http://git.reviewboard.kde.org/r/110506/diff/1/?file=144929#file144929line156>
> >
> > I'm not 100% sure but I think the test for the stylesType is not needed as a \
> > default style should never be added, but it surely does not harm either.
exactly the same thought i had when looking through the code yesterday. I don't feel \
overly confident in approving code so will wait for pierre
- C.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/110506/#review32766
-----------------------------------------------------------
On May 18, 2013, 3:39 p.m., Elvis Stansvik wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/110506/
> -----------------------------------------------------------
>
> (Updated May 18, 2013, 3:39 p.m.)
>
>
> Review request for Calligra and Pierre Stirnweiss.
>
>
> Description
> -------
>
> During the loading of the attached document (from bug #319048 ), \
> DockerStylesComboModel::styleApplied is called with the default paragraph style as \
> argument.
> The function assumes that the source model can provide an index for the supplied \
> style (see the calls to indexForCharacterStyle). But the source model explicitly \
> avoids adding items for the default styles, so these calls will return an invalid \
> index, which results in a -1 being added as a row to m_usedStyles. In the next call \
> to styleApplied, this will result in an invalid internalId being used to try to get \
> the corresponding style from the style manager. The invalid style pointer is then \
> used, resulting in the crash described in the bug.
> The attached patch turns DockerStylesComboModel::styleApplied into a no-op if the \
> supplied style is either the default character style or the default paragraph \
> styles, since there will never be any items for these in the source model.
> I'm not sure this is the correct fix, so would be great if e.g. Pierre could have a \
> look.
>
> This addresses bug 319048.
> http://bugs.kde.org/show_bug.cgi?id=319048
>
>
> Diffs
> -----
>
> plugins/textshape/dialogs/DockerStylesComboModel.cpp 40ae007
>
> Diff: http://git.reviewboard.kde.org/r/110506/diff/
>
>
> Testing
> -------
>
> Tried to load the attached document before/after the fix. And the problem seems \
> solved.
>
> File Attachments
> ----------------
>
> The ODT provoking the crash
> http://git.reviewboard.kde.org/media/uploaded/files/2013/05/18/space.odt
>
>
> Thanks,
>
> Elvis Stansvik
>
>
[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://git.reviewboard.kde.org/r/110506/">http://git.reviewboard.kde.org/r/110506/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On May 19th, 2013, 4:36 a.m. UTC, <b>Thorsten \
Zachmann</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">
<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="http://git.reviewboard.kde.org/r/110506/diff/1/?file=144929#file144929line156" \
style="color: black; font-weight: bold; text-decoration: \
underline;">plugins/textshape/dialogs/DockerStylesComboModel.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 \
DockerStylesComboModel::setStyleManager(KoStyleManager *sm)</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">156</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">m_sourceModel</span><span class="o">-></span><span \
class="n">stylesType</span><span class="p">()</span> <span class="o">==</span> <span \
class="n">AbstractStylesModel</span><span class="o">::</span><span \
class="n">CharacterStyle</span></pre></td> </tr>
<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">157</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="o">&&</span> <span class="n">style</span> <span \
class="o">==</span> <span class="n">m_styleManager</span><span \
class="o">-></span><span class="n">defaultCharacterStyle</span><span \
class="p">())</span> <span class="o">||</span></pre></td> </tr>
<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">158</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="p">(</span><span class="n">m_sourceModel</span><span \
class="o">-></span><span class="n">stylesType</span><span class="p">()</span> \
<span class="o">==</span> <span class="n">AbstractStylesModel</span><span \
class="o">::</span><span class="n">ParagraphStyle</span></pre></td> </tr>
<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">159</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="o">&&</span> <span class="n">style</span> <span \
class="o">==</span> <span class="n">m_styleManager</span><span \
class="o">-></span><span class="n">defaultParagraphStyle</span><span \
class="p">()))</span> <span class="p">{</span></pre></td> </tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I'm not 100% sure \
but I think the test for the stylesType is not needed as a default style should never \
be added, but it surely does not harm either.</pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">exactly the \
same thought i had when looking through the code yesterday. I don't feel overly \
confident in approving code so will wait for pierre</pre> <br />
<p>- C.</p>
<br />
<p>On May 18th, 2013, 3:39 p.m. UTC, Elvis Stansvik wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for Calligra and Pierre Stirnweiss.</div>
<div>By Elvis Stansvik.</div>
<p style="color: grey;"><i>Updated May 18, 2013, 3:39 p.m.</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;">During the loading of the attached document (from bug #319048 ), \
DockerStylesComboModel::styleApplied is called with the default paragraph style as \
argument.
The function assumes that the source model can provide an index for the supplied \
style (see the calls to indexForCharacterStyle). But the source model explicitly \
avoids adding items for the default styles, so these calls will return an invalid \
index, which results in a -1 being added as a row to m_usedStyles. In the next call \
to styleApplied, this will result in an invalid internalId being used to try to get \
the corresponding style from the style manager. The invalid style pointer is then \
used, resulting in the crash described in the bug.
The attached patch turns DockerStylesComboModel::styleApplied into a no-op if the \
supplied style is either the default character style or the default paragraph styles, \
since there will never be any items for these in the source model.
I'm not sure this is the correct fix, so would be great if e.g. Pierre could have \
a look.</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;">Tried to load the attached document before/after the fix. And the \
problem seems solved.</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="http://bugs.kde.org/show_bug.cgi?id=319048">319048</a>
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>plugins/textshape/dialogs/DockerStylesComboModel.cpp <span style="color: \
grey">(40ae007)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/110506/diff/" style="margin-left: \
3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments \
</h1>
<ul>
<li><a href="http://git.reviewboard.kde.org/media/uploaded/files/2013/05/18/space.odt">The \
ODT provoking the crash</a></li>
</ul>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic