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 0288c8ffecff4956a52b9147d441979941e8b87f "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>
112 lines
3.2 KiB
C++
112 lines
3.2 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 <xmlscript/xml_helper.hxx>
|
|
#include <o3tl/safeint.hxx>
|
|
#include <osl/diagnose.h>
|
|
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
|
|
|
|
using namespace com::sun::star;
|
|
using namespace com::sun::star::uno;
|
|
|
|
namespace xmlscript
|
|
{
|
|
|
|
void XMLElement::addAttribute( OUString const & rAttrName, OUString const & rValue )
|
|
{
|
|
_attrNames.push_back( rAttrName );
|
|
_attrValues.push_back( rValue );
|
|
}
|
|
|
|
void XMLElement::addSubElement( Reference< xml::sax::XAttributeList > const & xElem )
|
|
{
|
|
_subElems.push_back( xElem );
|
|
}
|
|
|
|
Reference< xml::sax::XAttributeList > const & XMLElement::getSubElement( sal_Int32 nIndex )
|
|
{
|
|
return _subElems[ static_cast<size_t>(nIndex) ];
|
|
}
|
|
|
|
void XMLElement::dumpSubElements( Reference< xml::sax::XDocumentHandler > const & xOut )
|
|
{
|
|
for (const Reference<XAttributeList> & _subElem : _subElems)
|
|
{
|
|
XMLElement * pElem = static_cast< XMLElement * >( _subElem.get() );
|
|
pElem->dump( xOut );
|
|
}
|
|
}
|
|
|
|
void XMLElement::dump( Reference< xml::sax::XDocumentHandler > const & xOut )
|
|
{
|
|
xOut->ignorableWhitespace( OUString() );
|
|
xOut->startElement( _name, static_cast< xml::sax::XAttributeList * >( this ) );
|
|
// write sub elements
|
|
dumpSubElements( xOut );
|
|
xOut->ignorableWhitespace( OUString() );
|
|
xOut->endElement( _name );
|
|
}
|
|
|
|
// XAttributeList
|
|
sal_Int16 XMLElement::getLength()
|
|
{
|
|
return static_cast<sal_Int16>(_attrNames.size());
|
|
}
|
|
|
|
OUString XMLElement::getNameByIndex( sal_Int16 nPos )
|
|
{
|
|
OSL_ASSERT( nPos >= 0 && o3tl::make_unsigned(nPos) < _attrNames.size() );
|
|
return _attrNames[ nPos ];
|
|
}
|
|
|
|
OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
|
|
{
|
|
OSL_ASSERT( nPos >= 0 && o3tl::make_unsigned(nPos) < _attrNames.size() );
|
|
// xxx todo
|
|
return OUString();
|
|
}
|
|
|
|
OUString XMLElement::getTypeByName( OUString const & /*rName*/ )
|
|
{
|
|
// xxx todo
|
|
return OUString();
|
|
}
|
|
|
|
OUString XMLElement::getValueByIndex( sal_Int16 nPos )
|
|
{
|
|
OSL_ASSERT( nPos >= 0 && o3tl::make_unsigned(nPos) < _attrNames.size() );
|
|
return _attrValues[ nPos ];
|
|
}
|
|
|
|
OUString XMLElement::getValueByName( OUString const & rName )
|
|
{
|
|
for ( size_t nPos = 0; nPos < _attrNames.size(); ++nPos )
|
|
{
|
|
if (_attrNames[ nPos ] == rName)
|
|
{
|
|
return _attrValues[ nPos ];
|
|
}
|
|
}
|
|
return OUString();
|
|
}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|