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

Stephan Bergmann sbergman at redhat.com
Wed Jan 17 08:02:30 UTC 2018


 onlineupdate/source/update/updater/bspatch.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0b25dc8231b51ef1fdb03274387851d1379a03b5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 17 09:01:18 2018 +0100

    Blind fix
    
    ...in --enable-online-update=mar code, after
    7d8e94444d989d0ac4a4055b207726708e9ec0da "convert a<b?a:b to std::min(a,b)"
    
    Change-Id: I8d03b2fc785595267c855c8ac9953d35782c7718

diff --git a/onlineupdate/source/update/updater/bspatch.cxx b/onlineupdate/source/update/updater/bspatch.cxx
index b77d3ea1097b..219c4d74cafa 100644
--- a/onlineupdate/source/update/updater/bspatch.cxx
+++ b/onlineupdate/source/update/updater/bspatch.cxx
@@ -105,7 +105,7 @@ MBS_ApplyPatch(const MBSPatchHeader *header, FILE* patchFile,
     unsigned char *wb = buf;
     while (r)
     {
-        const size_t count = std::min(r, SSIZE_MAX);
+        const size_t count = std::min(r, size_t(SSIZE_MAX));
         size_t c = fread(wb, 1, count, patchFile);
         if (c != count)
         {


More information about the Libreoffice-commits mailing list