[Libreoffice-commits] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Radek Doulík]

 patches/dev300/apply                          |    1 +
 patches/dev300/vcl-canvastools-fix-crash.diff |   22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

New commits:
commit daed77b4c7d5dee15114e7d6ad01ac9537097d2e
Author: Radek Doulik <rodo at novell.com>
Date:   Mon Nov 29 13:31:43 2010 +0100

    fix invalid read in doubleSequenceToColor, fixes crash in n#654065
    
    * patches/dev300/apply:
    * patches/dev300/vcl-canvastools-fix-crash.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9095210..04152b0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4163,3 +4163,4 @@ oox-pptx-import-fix-groups-2.diff, n#619678, rodo
 oox-pptx-import-fix-text-paragraph-autofit.diff, n#650035, rodo
 oox-pptx-import-fix-table-style.diff, n#650008, rodo
 oox-pptx-import-backport-from-LO-fix-zero-sized-shapes.diff, n#650051, rodo
+vcl-canvastools-fix-crash.diff, n#654065, rodo
diff --git a/patches/dev300/vcl-canvastools-fix-crash.diff b/patches/dev300/vcl-canvastools-fix-crash.diff
new file mode 100644
index 0000000..7376ae2
--- /dev/null
+++ b/patches/dev300/vcl-canvastools-fix-crash.diff
@@ -0,0 +1,22 @@
+diff -rup vcl-orig/source/helper/canvastools.cxx vcl/source/helper/canvastools.cxx
+--- vcl-orig/source/helper/canvastools.cxx	2010-11-29 12:14:14.000000000 +0100
++++ vcl/source/helper/canvastools.cxx	2010-11-29 12:16:29.000000000 +0100
+@@ -819,13 +819,13 @@ namespace vcl
+             const uno::Sequence< double >                   rColor,
+             const uno::Reference< rendering::XColorSpace >& xColorSpace )
+         {
+-            const rendering::ARGBColor& rARGBColor(
++            const rendering::ARGBColor aARGBColor(
+                 xColorSpace->convertToARGB(rColor)[0]);
+ 
+-            return Color( 255-toByteColor(rARGBColor.Alpha),
+-                          toByteColor(rARGBColor.Red),
+-                          toByteColor(rARGBColor.Green),
+-                          toByteColor(rARGBColor.Blue) );
++            return Color( 255-toByteColor(aARGBColor.Alpha),
++                          toByteColor(aARGBColor.Red),
++                          toByteColor(aARGBColor.Green),
++                          toByteColor(aARGBColor.Blue) );
+         }
+ 
+         //---------------------------------------------------------------------------------------