[Libreoffice-commits] core.git: connectivity/source

[Caolán McNamara]

 connectivity/source/drivers/postgresql/pq_tools.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a0c81e5ad40c4499e8bdab54ec48739359b934db
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Mar 1 21:14:38 2015 +0000

    V804: Decreased performance
    
    Change-Id: I484dd153e5d7f0664eac85595011d610f2b8df7b

diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 442a2a5..7971d88 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -836,10 +836,11 @@ OString extractSingleTableFromSelect( const OStringVector &vec )
                             { "join", "natural", "outer", "inner", "left", "right", "full" , 0 };
                         for( int i = 0 ; forbiddenKeywords[i] ; i ++ )
                         {
+                            size_t nKeywordLen = strlen(forbiddenKeywords[i]);
                             if( 0 == rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
                                  vec[token].pData->buffer, vec[token].pData->length,
-                                 forbiddenKeywords[i], strlen(forbiddenKeywords[i]),
-                                 strlen(forbiddenKeywords[i]) ) )
+                                 forbiddenKeywords[i], nKeywordLen,
+                                 nKeywordLen ) )
                             {
                                 // whoops, it is a join
                                 ret.clear();