commit 11b8b8c10016902e216878223db8951c3c65441a
author Yann Collet <cyan@fb.com> Fri Aug 31 10:01:06 2018 -0700
committer Yann Collet <cyan@fb.com> Fri Aug 31 10:01:06 2018 -0700
tree 48aa8a122d796d5f13df414a8e90f8048db9b4bb
parent 0ff67511e64fb81880544ffaa4d03af7125e3de2

silenced false-positive scan-build warning

contrib/largeNbDicts/largeNbDicts.c

diff --git a/contrib/largeNbDicts/largeNbDicts.c b/contrib/largeNbDicts/largeNbDicts.c
index 70013cd..943a644 100644
--- a/contrib/largeNbDicts/largeNbDicts.c
+++ b/contrib/largeNbDicts/largeNbDicts.c
@@ -74,6 +74,7 @@
 /* @return : kBuffNull if any error */
 static buffer_t createBuffer(size_t capacity)
 {
+    assert(capacity > 0);
     void* const ptr = malloc(capacity);
     if (ptr==NULL) return kBuffNull;
 
@@ -96,18 +97,6 @@
     buff->size = readSize;
 }
 
-/* @return : kBuffNull if any error */
-static buffer_t createBuffer_fromHandle(FILE* f, size_t bufferSize)
-{
-    buffer_t buff = createBuffer(bufferSize);
-    if (buff.ptr == NULL) return kBuffNull;
-    fillBuffer_fromHandle(&buff, f);
-    if (buff.size != buff.capacity) {
-        freeBuffer(buff);
-        return kBuffNull;
-    }
-    return buff;
-}
 
 /* @return : kBuffNull if any error */
 static buffer_t createBuffer_fromFile(const char* fileName)
@@ -118,16 +107,22 @@
     if (fileSize == UTIL_FILESIZE_UNKNOWN) return kBuffNull;
     assert((U64)bufferSize == fileSize);   /* check overflow */
 
-    {   buffer_t buff;
-        FILE* const f = fopen(fileName, "rb");
+    {   FILE* const f = fopen(fileName, "rb");
         if (f == NULL) return kBuffNull;
 
-        buff = createBuffer_fromHandle(f, bufferSize);
+        buffer_t buff = createBuffer(bufferSize);
+        CONTROL(buff.ptr != NULL);
+
+        fillBuffer_fromHandle(&buff, f);
+        CONTROL(buff.size == buff.capacity);
+
         fclose(f);   /* do nothing specific if fclose() fails */
         return buff;
     }
 }
 
+
+/* @return : kBuffNull if any error */
 static buffer_t
 createDictionaryBuffer(const char* dictionaryName,
                        const void* srcBuffer,
@@ -136,7 +131,7 @@
 {
     if (dictionaryName) {
         DISPLAYLEVEL(3, "loading dictionary %s \n", dictionaryName);
-        return createBuffer_fromFile(dictionaryName);
+        return createBuffer_fromFile(dictionaryName);  /* note : result might be kBuffNull */
 
     } else {
 
@@ -172,11 +167,11 @@
     for (unsigned n=0; n<nbFiles; n++) {
         U64 fileSize = UTIL_getFileSize(fileNamesTable[n]);
         if (UTIL_isDirectory(fileNamesTable[n])) {
-            fileSizes[n] = 0; fileSize = 0;
+            fileSizes[n] = 0;
             continue;
         }
         if (fileSize == UTIL_FILESIZE_UNKNOWN) {
-            fileSizes[n] = 0; fileSize = 0;
+            fileSizes[n] = 0;
             continue;
         }
 
@@ -336,6 +331,7 @@
     U64 const totalSizeToLoad = UTIL_getTotalFileSize(fileNamesTable, nbFiles);
     assert(totalSizeToLoad <= BENCH_SIZE_MAX);
     size_t const loadedSize = (size_t)totalSizeToLoad;
+    assert(loadedSize > 0);
     void* const srcBuffer = malloc(loadedSize);
     assert(srcBuffer != NULL);
 
@@ -777,5 +773,10 @@
         filenameTable = UTIL_createFileList(nameTable, nameIdx, &buffer_containing_filenames, &nbFiles, 1 /* follow_links */);
     }
 
-    return bench(filenameTable, nbFiles, dictionary, blockSize, cLevel, nbDicts, nbRounds);
+    int result = bench(filenameTable, nbFiles, dictionary, blockSize, cLevel, nbDicts, nbRounds);
+
+    free(buffer_containing_filenames);
+    free(nameTable);
+
+    return result;
 }