Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Hey Michael,

2012/9/27 Michael Meeks <michael.meeks@suse.com>:
Hi Markus,

On Thu, 2012-09-27 at 00:34 +0200, Markus Mohrhard wrote:
[1] fixes a crash when opening the test file. The problem is that we
dereference a past the end element. The code was always wrong but we
fixed another bug in this part of the code for 3-6 so that it now
crashes.

        Amusing :-)

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=70412d0f3f7979d3d069be8121d49dbb96775cce

        Seems reasonable, but would:

@@ -564,7 +564,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
             return false;

         SCROW nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, 
nColRow);
-        while ( (nColRow < nCellCount) && (nThisRow < nRow) )
+        while ( (nColRow < nCellCount - 1) && (nThisRow < nRow) )
             nThisRow = ScDBQueryDataIterator::GetRowByColEntryIndex(*mpDoc, nTab, nCol, 
++nColRow);

         if ( nColRow < nCellCount && nThisRow <= mpParam->nRow2 )

        Not have the same effect ? either way I cherry-picked as-is to -3-6.


No this one results in a infinite loop because the check nColRow <
nCellCount in the next if will be always true when it was not before.
My patch still increments so that the check there is false and we stop
iterating through the DB range.

Regards,
Markus

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.