[Libreoffice-commits] online.git: wsd/FileServer.cpp

[Ashod Nakashian]

 wsd/FileServer.cpp |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit c9b0dc04240ad92220671f1585b94f536922af13
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Jul 2 22:11:44 2017 -0400

    wsd: cleanup deflate data and free memory
    
    With help from Valgrind to find and verify
    these leaks. Also some minor cleanup to the
    deflate logic.
    
    Change-Id: I3bb3f1e01cef7025c45874ce52cfc922dfd19e21
    Reviewed-on: https://gerrit.libreoffice.org/39465
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index c4ece6f8..6f56f333 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -355,18 +355,18 @@ void FileServerRequestHandler::readDirToHash(const std::string &basePath, const
             deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY);
 
             auto buf = std::unique_ptr<char[]>(new char[fileStat.st_size]);
-            std::string compressedFile = "";
-            std::string uncompressedFile = "";
+            std::string compressedFile;
+            compressedFile.reserve(fileStat.st_size);
+            std::string uncompressedFile;
+            uncompressedFile.reserve(fileStat.st_size);
             do {
                 file.read(&buf[0], fileStat.st_size);
                 const long unsigned int size = file.gcount();
                 if (size == 0)
                     break;
 
-                long unsigned int haveComp;
-                long unsigned int compSize = compressBound(size);
-                char *cbuf;
-                cbuf = (char *)calloc(compSize, sizeof(char));
+                const long unsigned int compSize = compressBound(size);
+                char *cbuf = (char *)calloc(compSize, sizeof(char));
 
                 strm.next_in = (unsigned char *)&buf[0];
                 strm.avail_in = size;
@@ -375,16 +375,17 @@ void FileServerRequestHandler::readDirToHash(const std::string &basePath, const
 
                 deflate(&strm, Z_FINISH);
 
-                haveComp = compSize - strm.avail_out;
+                const long unsigned int haveComp = compSize - strm.avail_out;
                 std::string partialcompFile(cbuf, haveComp);
                 std::string partialuncompFile(buf.get(), size);
                 compressedFile = compressedFile + partialcompFile;
                 uncompressedFile = uncompressedFile + partialuncompFile;
+                free(cbuf);
 
             } while(true);
 
-            std::pair<std::string, std::string> FilePair(uncompressedFile, compressedFile);
-            FileHash.emplace(relPath, FilePair);
+            FileHash.emplace(relPath, std::make_pair(uncompressedFile, compressedFile));
+            deflateEnd(&strm);
         }
     }
     closedir(workingdir);