Adapt Base64::decodeSomeChars to change from OUString to std::u16string_view

...in 9c95415de877af1430ab5b7123e11dedd0ea622c "Let comphelper::Base64::decode*
take std::u16string_view"

Change-Id: I42b1552fba80568b422cb60ccc99a7ab8664f2d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133711
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 13 insertions, 8 deletions

diff --git a/comphelper/source/misc/base64.cxx b/comphelper/source/misc/base64.cxx
index d73465601adb..e4a818011332 100644
--- a/comphelper/source/misc/base64.cxx
+++ b/comphelper/source/misc/base64.cxx
@@ -17,10 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <cstddef>
+
 #include <comphelper/base64.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 
+#include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 
 using namespace com::sun::star;
@@ -138,26 +143,26 @@ void Base64::encode(OUStringBuffer& aStrBuffer, const uno::Sequence<sal_Int8>& a
 
 void Base64::decode(uno::Sequence<sal_Int8>& aBuffer, std::u16string_view sBuffer)
 {
-    sal_Int32 nCharsDecoded = decodeSomeChars( aBuffer, sBuffer );
-    OSL_ENSURE( sal_uInt32(nCharsDecoded) == sBuffer.size(), "some bytes left in base64 decoding!" );
+    std::size_t nCharsDecoded = decodeSomeChars( aBuffer, sBuffer );
+    OSL_ENSURE( nCharsDecoded == sBuffer.size(), "some bytes left in base64 decoding!" );
 }
 
-sal_Int32 Base64::decodeSomeChars(uno::Sequence<sal_Int8>& rOutBuffer, std::u16string_view rInBuffer)
+std::size_t Base64::decodeSomeChars(uno::Sequence<sal_Int8>& rOutBuffer, std::u16string_view rInBuffer)
 {
-    sal_Int32 nInBufferLen = rInBuffer.size();
-    sal_Int32 nMinOutBufferLen = (nInBufferLen / 4) * 3;
-    if( rOutBuffer.getLength() < nMinOutBufferLen )
+    std::size_t nInBufferLen = rInBuffer.size();
+    std::size_t nMinOutBufferLen = (nInBufferLen / 4) * 3;
+    if( o3tl::make_unsigned(rOutBuffer.getLength()) < nMinOutBufferLen )
         rOutBuffer.realloc( nMinOutBufferLen );
 
     const sal_Unicode *pInBuffer = rInBuffer.data();
     sal_Int8 *pOutBuffer = rOutBuffer.getArray();
     sal_Int8 *pOutBufferStart = pOutBuffer;
-    sal_Int32 nCharsDecoded = 0;
+    std::size_t nCharsDecoded = 0;
 
     sal_uInt8 aDecodeBuffer[4];
     sal_Int32 nBytesToDecode = 0;
     sal_Int32 nBytesGotFromDecoding = 3;
-    sal_Int32 nInBufferPos= 0;
+    std::size_t nInBufferPos= 0;
     while( nInBufferPos < nInBufferLen )
     {
         sal_Unicode cChar = *pInBuffer;