New loplugin:unsignedcompare

"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>

2 files changed, 13 insertions, 12 deletions

diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx
index 430dc37cc071..8493b3351e83 100644
--- a/configmgr/source/dconf.cxx
+++ b/configmgr/source/dconf.cxx
@@ -14,7 +14,6 @@
 #include <cstring>
 #include <forward_list>
 #include <limits>
-#include <type_traits>
 #include <vector>
 
 extern "C" {
@@ -24,6 +23,7 @@ extern "C" {
 }
 
 #include <com/sun/star/uno/Sequence.hxx>
+#include <o3tl/safeint.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
@@ -322,7 +322,7 @@ bool getStringValue(
     }
     gsize n;
     char const * p = g_variant_get_string(variant.get(), &n);
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long string value for key " << key);
@@ -366,7 +366,7 @@ bool getHexbinaryValue(
     gsize n;
     gconstpointer p = g_variant_get_fixed_array(
         variant.get(), &n, sizeof (guchar));
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long hexbinary value for key " << key);
@@ -404,7 +404,7 @@ bool getBooleanList(
     gsize n;
     gconstpointer p = g_variant_get_fixed_array(
         variant.get(), &n, sizeof (guchar));
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long boolean list for key " << key);
@@ -431,7 +431,7 @@ bool getShortList(
     gsize n;
     gconstpointer p = g_variant_get_fixed_array(
         variant.get(), &n, sizeof (gint16));
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long short list for key " << key);
@@ -458,7 +458,7 @@ bool getIntList(
     gsize n;
     gconstpointer p = g_variant_get_fixed_array(
         variant.get(), &n, sizeof (gint32));
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long int list for key " << key);
@@ -485,7 +485,7 @@ bool getLongList(
     gsize n;
     gconstpointer p = g_variant_get_fixed_array(
         variant.get(), &n, sizeof (gint64));
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long long list for key " << key);
@@ -512,7 +512,7 @@ bool getDoubleList(
     gsize n;
     gconstpointer p = g_variant_get_fixed_array(
         variant.get(), &n, sizeof (gdouble));
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long double list for key " << key);
@@ -537,7 +537,7 @@ bool getStringList(
         return false;
     }
     gsize n = g_variant_n_children(variant.get());
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long string list for key " << key);
@@ -565,7 +565,7 @@ bool getHexbinaryList(
         return false;
     }
     gsize n = g_variant_n_children(variant.get());
-    if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+    if (n > o3tl::make_unsigned(
             std::numeric_limits<sal_Int32>::max()))
     {
         SAL_WARN("configmgr.dconf", "too long hexbinary list for key " << key);
@@ -765,7 +765,7 @@ void readDir(
     StringArrayHolder a(dconf_client_list(client.get(), dir.getStr(), nullptr));
     for (char const * const * p = a.get(); *p != nullptr; ++p) {
         std::size_t n = std::strlen(*p);
-        if (n > static_cast<typename std::make_unsigned<sal_Int32>::type>(
+        if (n > o3tl::make_unsigned(
                 std::numeric_limits<sal_Int32>::max()))
         {
             SAL_WARN("configmgr.dconf", "too long dir/key in dir " << dir);
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 017e925dee48..22fd43ecf797 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <o3tl/safeint.hxx>
 #include <osl/file.h>
 #include <osl/file.hxx>
 #include <rtl/string.h>
@@ -58,7 +59,7 @@ namespace {
 
 OString convertToUtf8(std::u16string_view text) {
     OString s;
-    assert(text.size() <= sal_uInt32(std::numeric_limits<sal_Int32>::max()));
+    assert(text.size() <= o3tl::make_unsigned(std::numeric_limits<sal_Int32>::max()));
     if (!rtl_convertUStringToString(
             &s.pData, text.data(), text.size(),
             RTL_TEXTENCODING_UTF8,