Merge f4a4f65f4c into 82d470564d

prevent possible segfault when creating seek table

.github/workflows/solaris.yml

@@ -0,0 +1,55 @@
+name: Run Solaris tests
+
+# This test runs within a Solaris VM.
+# It is very slow.
+# Consequently, we only want to run it on demand.
+# The trigger is the feature branch name.
+
+on:
+  push:
+    branches:
+      - '*sun*'
+      - '*Sun*'
+      - '*solaris*'
+      - '*Solaris*'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: solaris-vm test
+    env:
+      EX_TOKEN: "ex_value"
+    steps:
+    - uses: actions/checkout@v4
+    - name: Test in Solaris
+      id: test
+      uses: vmactions/solaris-vm@v1.0.1
+      with:
+        envs: 'EX_TOKEN'
+        usesh: true
+        prepare: |
+          pkgutil -y -i socat
+        release: "11.4-gcc"
+        run: |
+          if [ -n "test" ]; then
+            echo "false"
+          fi
+          if [ "test" ]; then
+            echo "test"
+          fi
+          pwd
+          ls -lah
+          whoami
+          env
+          psrinfo -vp
+          cat /etc/release
+          psrinfo -v
+          echo "::memstat" | mdb -k
+          gcc -v
+          CC=gcc CFLAGS="-Werror -O1" gmake -j check
+          pkg install cmake
+          cmake --version
+          rm -rf cmakebuild install
+          mkdir -p cmakebuild install
+          cd cmakebuild; cmake -Wdev -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror -O0" -DCMAKE_INSTALL_PREFIX=install ../build/cmake; cd ..
+          cmake --build cmakebuild --target install -- -j V=1

build/cmake/CMakeLists.txt

@@ -34,7 +34,6 @@ project(zstd
   VERSION "${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}"
   LANGUAGES C   # Main library is in C
             ASM # And ASM
-            CXX # Testing contributed code also utilizes CXX
   )
 
 message(STATUS "ZSTD VERSION: ${zstd_VERSION}")

build/cmake/CMakeModules/AddZstdCompilationFlags.cmake

@@ -51,7 +51,7 @@ function(EnableCompilerFlag _flag _C _CXX _LD)
 endfunction()
 
 macro(ADD_ZSTD_COMPILATION_FLAGS)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW) #Not only UNIX but also WIN32 for MinGW
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW) # Not only UNIX but also WIN32 for MinGW
         # It's possible to select the exact standard used for compilation.
         # It's not necessary, but can be employed for specific purposes.
         # Note that zstd source code is compatible with both C++98 and above

build/cmake/contrib/CMakeLists.txt

@@ -7,7 +7,11 @@
 # in the COPYING file in the root directory of this source tree).
 # ################################################################
 
-project(contrib)
+project(contrib
+  LANGUAGES C   # Main library is in C
+  ASM # And ASM
+  CXX # pzstd, gen_html
+)
 
 add_subdirectory(pzstd)
 add_subdirectory(gen_html)

contrib/seekable_format/zstdseek_decompress.c

@@ -252,6 +252,8 @@ size_t ZSTD_seekable_free(ZSTD_seekable* zs)
 
 ZSTD_seekTable* ZSTD_seekTable_create_fromSeekable(const ZSTD_seekable* zs)
 {
+    assert(zs != NULL);
+    if (zs->seekTable.entries == NULL) return NULL;
     ZSTD_seekTable* const st = (ZSTD_seekTable*)malloc(sizeof(ZSTD_seekTable));
     if (st==NULL) return NULL;
 

doc/zstd_compression_format.md

@@ -1120,7 +1120,7 @@ For the purpose of counting total allocated probability points, it counts as one
 
 Symbols probabilities are read one by one, in order.
 After each probability is decoded, the total nb of probability points is updated.
-This is used to dermine how many bits must be read to decode the probability of next symbol.
+This is used to determine how many bits must be read to decode the probability of next symbol.
 
 When a symbol has a __probability__ of `zero` (decoded from reading a Value `1`),
 it is followed by a 2-bits repeat flag.

lib/compress/hist.h

@@ -75,7 +75,7 @@ unsigned HIST_count_simple(unsigned* count, unsigned* maxSymbolValuePtr,
                            const void* src, size_t srcSize);
 
 /*! HIST_add() :
- *  Lowest level: just add nb of occurences of characters from @src into @count.
+ *  Lowest level: just add nb of occurrences of characters from @src into @count.
  *  @count is not reset. @count array is presumed large enough (i.e. 1 KB).
  @  This function does not need any additional stack memory.
  */

lib/zstd.h

@@ -224,7 +224,7 @@ ZSTDLIB_API size_t ZSTD_findFrameCompressedSize(const void* src, size_t srcSize)
  * it's recommended to provide @dstCapacity >= ZSTD_compressBound(srcSize)
  * as it eliminates one potential failure scenario,
  * aka not enough room in dst buffer to write the compressed frame.
- * Note : ZSTD_compressBound() itself can fail, if @srcSize > ZSTD_MAX_INPUT_SIZE .
+ * Note : ZSTD_compressBound() itself can fail, if @srcSize >= ZSTD_MAX_INPUT_SIZE .
  *        In which case, ZSTD_compressBound() will return an error code
  *        which can be tested using ZSTD_isError().
  *

programs/zstdcli.c

@@ -696,7 +696,7 @@ static void printDefaultCParams(const char* filename, const char* dictFileName,
     unsigned long long fileSize = UTIL_getFileSize(filename);
     const size_t dictSize = dictFileName != NULL ? (size_t)UTIL_getFileSize(dictFileName) : 0;
     const ZSTD_compressionParameters cParams = ZSTD_getCParams(cLevel, fileSize, dictSize);
-    if (fileSize != UTIL_FILESIZE_UNKNOWN) DISPLAY("%s (%u bytes)\n", filename, (unsigned)fileSize);
+    if (fileSize != UTIL_FILESIZE_UNKNOWN) DISPLAY("%s (%llu bytes)\n", filename, fileSize);
     else DISPLAY("%s (src size unknown)\n", filename);
     DISPLAY(" - windowLog     : %u\n", cParams.windowLog);
     DISPLAY(" - chainLog      : %u\n", cParams.chainLog);