aef7feb3e6
"Find explicit casts from signed to unsigned integer in comparison against
unsigned integer, where the cast is presumably used to avoid warnings about
signed vs. unsigned comparisons, and could thus be replaced with
o3tl::make_unsigned for clairty." (compilerplugins/clang/unsignedcompare.cxx)
o3tl::make_unsigned requires its argument to be non-negative, and there is a
chance that some original code like
static_cast<sal_uInt32>(n) >= c
used the explicit cast to actually force a (potentially negative) value of
sal_Int32 to be interpreted as an unsigned sal_uInt32, rather than using the
cast to avoid a false "signed vs. unsigned comparison" warning in a case where
n is known to be non-negative. It appears that restricting this plugin to non-
equality comparisons (<, >, <=, >=) and excluding equality comparisons (==, !=)
is a useful heuristic to avoid such false positives. The only remainging false
positive I found was 0288c8ffec
"Rephrase cast
from sal_Int32 to sal_uInt32".
But which of course does not mean that there were no further false positivies
that I missed. So this commit may accidentally introduce some false hits of the
assert in o3tl::make_unsigned. At least, it passed a full (Linux ASan+UBSan
--enable-dbgutil) `make check && make screenshot`.
It is by design that o3tl::make_unsigned only accepts signed integer parameter
types (and is not defined as a nop for unsigned ones), to avoid unnecessary uses
which would in general be suspicious. But the STATIC_ARRAY_SELECT macro in
include/oox/helper/helper.hxx is used with both signed and unsigned types, so
needs a little oox::detail::make_unsigned helper function for now. (The
ultimate fix being to get rid of the macro in the first place.)
Change-Id: Ia4adc9f44c70ad1dfd608784cac39ee922c32175
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87556
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
174 lines
5.4 KiB
C++
174 lines
5.4 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <o3tl/safeint.hxx>
|
|
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
|
|
|
|
using namespace ::com::sun::star;
|
|
using css::uno::Reference;
|
|
using css::uno::XInterface;
|
|
|
|
namespace comphelper
|
|
{
|
|
|
|
UnoInterfaceToUniqueIdentifierMapper::UnoInterfaceToUniqueIdentifierMapper()
|
|
: mnNextId( 1 )
|
|
{
|
|
}
|
|
|
|
const OUString& UnoInterfaceToUniqueIdentifierMapper::registerReference( const Reference< XInterface >& rInterface )
|
|
{
|
|
// Be certain that the references we store in our table are to the
|
|
// leading / primary XInterface - cf. findReference
|
|
uno::Reference< uno::XInterface > xRef( rInterface, uno::UNO_QUERY );
|
|
|
|
IdMap_t::const_iterator aIter;
|
|
if( findReference( xRef, aIter ) )
|
|
{
|
|
return (*aIter).first;
|
|
}
|
|
else
|
|
{
|
|
OUString aId = "id" + OUString::number( mnNextId++ );
|
|
return (*maEntries.emplace( aId, xRef ).first).first;
|
|
}
|
|
}
|
|
|
|
bool UnoInterfaceToUniqueIdentifierMapper::registerReference( const OUString& rIdentifier, const Reference< XInterface >& rInterface )
|
|
{
|
|
IdMap_t::const_iterator aIter;
|
|
|
|
// Be certain that the references we store in our table are to the
|
|
// leading / primary XInterface - cf. findReference
|
|
uno::Reference< uno::XInterface > xRef( rInterface, uno::UNO_QUERY );
|
|
|
|
if( findReference( xRef, aIter ) )
|
|
{
|
|
return rIdentifier != (*aIter).first;
|
|
}
|
|
else if( findIdentifier( rIdentifier, aIter ) )
|
|
{
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
insertReference( rIdentifier, xRef );
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void UnoInterfaceToUniqueIdentifierMapper::registerReferenceAlways( const OUString& rIdentifier, const Reference< XInterface >& rInterface )
|
|
{
|
|
// Be certain that the references we store in our table are to the
|
|
// leading / primary XInterface - cf. findReference
|
|
uno::Reference< uno::XInterface > xRef( rInterface, uno::UNO_QUERY );
|
|
|
|
insertReference( rIdentifier, xRef );
|
|
}
|
|
|
|
const OUString& UnoInterfaceToUniqueIdentifierMapper::getIdentifier( const Reference< XInterface >& rInterface ) const
|
|
{
|
|
IdMap_t::const_iterator aIter;
|
|
if( findReference( rInterface, aIter ) )
|
|
{
|
|
return (*aIter).first;
|
|
}
|
|
else
|
|
{
|
|
static const OUString aEmpty;
|
|
return aEmpty;
|
|
}
|
|
}
|
|
|
|
const Reference< XInterface >& UnoInterfaceToUniqueIdentifierMapper::getReference( const OUString& rIdentifier ) const
|
|
{
|
|
IdMap_t::const_iterator aIter;
|
|
if( findIdentifier( rIdentifier, aIter ) )
|
|
{
|
|
return (*aIter).second;
|
|
}
|
|
else
|
|
{
|
|
static const Reference< XInterface > aEmpty;
|
|
return aEmpty;
|
|
}
|
|
}
|
|
|
|
bool UnoInterfaceToUniqueIdentifierMapper::findReference( const Reference< XInterface >& rInterface, IdMap_t::const_iterator& rIter ) const
|
|
{
|
|
uno::Reference< uno::XInterface > xRef( rInterface, uno::UNO_QUERY );
|
|
|
|
const IdMap_t::const_iterator aEnd( maEntries.end() );
|
|
rIter = std::find_if(maEntries.begin(), aEnd, [&xRef](const IdMap_t::value_type& rItem) {
|
|
// The Reference == operator, does a repeated queryInterface on
|
|
// this to ensure we got the right XInterface base-class. However,
|
|
// we can be sure that this has been done already by the time we
|
|
// get to here.
|
|
return rItem.second.get() == xRef.get();
|
|
});
|
|
|
|
return rIter != aEnd;
|
|
}
|
|
|
|
bool UnoInterfaceToUniqueIdentifierMapper::findIdentifier( const OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const
|
|
{
|
|
rIter = maEntries.find( rIdentifier );
|
|
return rIter != maEntries.end();
|
|
}
|
|
|
|
void UnoInterfaceToUniqueIdentifierMapper::insertReference( const OUString& rIdentifier, const Reference< XInterface >& rInterface )
|
|
{
|
|
maEntries[rIdentifier] = rInterface;
|
|
|
|
// see if this is a reference like something we would generate in the future
|
|
const sal_Unicode *p = rIdentifier.getStr();
|
|
sal_Int32 nLength = rIdentifier.getLength();
|
|
|
|
// see if the identifier is 'id' followed by a pure integer value
|
|
if( nLength < 2 || p[0] != 'i' || p[1] != 'd' )
|
|
return;
|
|
|
|
nLength -= 2;
|
|
p += 2;
|
|
|
|
while(nLength--)
|
|
{
|
|
if( (*p < '0') || (*p > '9') )
|
|
return; // a custom id, that will never conflict with generated id's
|
|
|
|
p++;
|
|
}
|
|
|
|
// the identifier is a pure integer value
|
|
// so we make sure we will never generate
|
|
// an integer value like this one
|
|
sal_Int32 nId = rIdentifier.copy(2).toInt32();
|
|
if (nId > 0 && mnNextId <= o3tl::make_unsigned(nId))
|
|
{
|
|
mnNextId = nId;
|
|
++mnNextId;
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|