Attachment 112341 Details for Bug 88444 – Suggested patch

[patch] Suggested patch

0001-fdo-88444-Guard-against-out-of-bound-access.patch (text/plain), 1.38 KB, created by How can I remove my account? on 2015-01-16 12:58:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: How can I remove my account?

Created: 2015-01-16 12:58:14 UTC

Size: 1.38 KB

patch

obsolete

>From fcb3aa8d6baaee8c725c76161a70d9a282c6eaab Mon Sep 17 00:00:00 2001
>From: Tor Lillqvist <tml@collabora.com>
>Date: Fri, 16 Jan 2015 14:56:17 +0200
>Subject: [PATCH] fdo#88444: Guard against out-of-bound access
>
>Change-Id: Id918934eed1e5221a40e3a04604640fa2b158fe4
>---
> sc/source/core/opencl/opbase.cxx | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
>index 7589de9..fd6cdfb 100644
>--- a/sc/source/core/opencl/opbase.cxx
>+++ b/sc/source/core/opencl/opbase.cxx
>@@ -190,13 +190,20 @@ void CheckVariables::CheckSubArgumentIsNan2( std::stringstream & ss,
>     ss<< "    tmp";
>     ss<< i;
>     ss<< "= fsum(";
>-    vSubArguments[i]->GenDeclRef(ss);
>     if(vSubArguments[i]->GetFormulaToken()->GetType() ==
>      formula::svDoubleVectorRef)
>+    {
>+        vSubArguments[i]->GenDeclRef(ss);
>         ss<<"["<< p.c_str()<< "]";
>+    }
>     else  if(vSubArguments[i]->GetFormulaToken()->GetType() ==
>      formula::svSingleVectorRef)
>-        ss<<"[get_group_id(1)]";
>+    {
>+        formula::SingleVectorRefToken *pSVR = dynamic_cast<formula::SingleVectorRefToken*>(vSubArguments[i]->GetFormulaToken());
>+        ss<<"(get_group_id(1)<" << pSVR->GetArrayLength() << "?";
>+        vSubArguments[i]->GenDeclRef(ss);
>+        ss<<"[get_group_id(1)]:0)";
>+    }
>     ss<<", 0);\n";
> #else
>     ss <<"    tmp";
>-- 
>1.8.1.4
>

Actions: View

Attachments on bug 88444: 112270 | 112280 | 112281 | 112341 | 112453 | 112479 | 113075 | 113076 | 113306