[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [calligra] libs/textlayout: Fix words hangs loading this document.
From:       "C. Boemann" <cbo () boemann ! dk>
Date:       2011-06-10 23:56:29
Message-ID: 201106110156.29654.cbo () boemann ! dk
[Download RAW message or body]

good catch


On Saturday 11 June 2011 00:28:14 Sebastian Sauer wrote:
> Git commit 365efa71938ccec991c4acfce747d95c7e2f73a0 by Sebastian Sauer.
> Committed on 11/06/2011 at 00:23.
> Pushed by sebsauer into branch 'master'.
> 
> Fix words hangs loading this document.
> FrameIterator's with different addresses can be the same.
> BUG:275342
> 
> M  +2    -2    libs/textlayout/FrameIterator.cpp
> 
> http://commits.kde.org/calligra/365efa71938ccec991c4acfce747d95c7e2f73a0
> 
> diff --git a/libs/textlayout/FrameIterator.cpp
> b/libs/textlayout/FrameIterator.cpp index 324bed0..5d4d38d 100644
> --- a/libs/textlayout/FrameIterator.cpp
> +++ b/libs/textlayout/FrameIterator.cpp
> @@ -67,11 +67,11 @@ bool FrameIterator::operator ==(const FrameIterator
> &other) return false;
> 
>      if (currentTableIterator || other.currentTableIterator) {
> -        if (currentTableIterator != other.currentTableIterator)
> +        if (!currentTableIterator || !other.currentTableIterator)
>              return false;
>          return *currentTableIterator == *(other.currentTableIterator);
>      } else if (currentSubFrameIterator || other.currentSubFrameIterator) {
> -        if (currentSubFrameIterator != other.currentSubFrameIterator)
> +        if (!currentSubFrameIterator || !other.currentSubFrameIterator)
>              return false;
>          return *currentSubFrameIterator ==
> *(other.currentSubFrameIterator); } else {
[prev in list] [next in list] [prev in thread] [next in thread]