commit f857358d83e7c105271eb0e2c43f0b036f14f284
author Matthew J. Francis <mjay.francis@gmail.com> Wed Nov 19 11:25:28 2014 +0800
committer Caolán McNamara <caolanm@redhat.com> Wed Nov 19 09:17:07 2014 +0000
tree 80ee743ec0982c20a48cf8da8f754a81cc1614a3
parent a47a16cb2ec4ccb3c7b503c7726528b95c639406

fdo#86298 Avoid crash blending upside down Bitmaps of differing size

Change-Id: I3ed0dec7c2f8d80ca104f8ba8d47894ace582c0a
Reviewed-on: https://gerrit.libreoffice.org/12961
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/source/gdi/bmpfast.cxx

diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 1764dc6..ff51c23 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -566,7 +566,7 @@ bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
    // source and destination don't match: upside down
    if( (rSrcBuffer.mnFormat ^ rDstBuffer.mnFormat) & BMP_FORMAT_TOP_DOWN )
    {
        aDstLine.AddByteOffset( (rSrcBuffer.mnHeight - 1) * nDstLinestep );
        aDstLine.AddByteOffset( (rDstBuffer.mnHeight - 1) * nDstLinestep );
        nDstLinestep = -nDstLinestep;
    }