Merge pull request #1165 from MusicScience37/fix-error-for-empty-data-in-fbuffer

Fixed processing of empty data in fbuffer class.

.github/depends/boost.sh

@@ -49,7 +49,7 @@ while getopts "b:t:p:" c; do
 done
 
 mkdir $prefix || exit 1
-wget https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.bz2 || exit 1
+wget https://archives.boost.io/release/1.85.0/source/boost_1_85_0.tar.bz2 || exit 1
 tar xf boost_1_85_0.tar.bz2 || exit 1
 cd boost_1_85_0
 ./bootstrap.sh || exit 1

.github/workflows/coverage.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Install build dependencies
       run: |
         sudo apt-get update
@@ -24,7 +24,7 @@ jobs:
 
     - name: Cache boost
       id: cache-boost
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/boost-prefix/
         key: ${{ runner.os }}-boost-1-85-0-2024-05-27
@@ -35,7 +35,7 @@ jobs:
 
     - name: Cache zlib
       id: cache-zlib
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/zlib-prefix/
         key: ${{ runner.os }}-zlib-64-1-2-11-2021-08-09
@@ -63,12 +63,15 @@ jobs:
         cmake --build build --target all || exit 1
         ctest --test-dir build || exit 1
 
-    - name: Upload coverage to Codecov
+    - name: Generate coverage
       working-directory: build
       run: |
         # Create lcov report
-        lcov --capture --directory . --output-file coverage.info
+        lcov --capture --directory . --output-file coverage.info --ignore-errors mismatch
         lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files
         lcov --list coverage.info # debug info
-        # Uploading report to CodeCov
-        bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v5
+      with:
+        files: build/coverage.info
+        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/gha.yml

@@ -84,7 +84,7 @@ jobs:
 
   linux:
     name: ${{ format('Linux (pattern {0})', matrix.pattern) }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -136,7 +136,7 @@ jobs:
 
         case ${{ matrix.pattern }} in
           0)
-            export CXX="clang++-10"
+            export CXX="clang++"
             export MSGPACK_CXX_VERSION="MSGPACK_CXX11=ON"
             ;;
           1)
@@ -144,7 +144,7 @@ jobs:
             export MSGPACK_CXX_VERSION="MSGPACK_CXX11=ON"
             ;;
           2)
-            export CXX="clang++-10"
+            export CXX="clang++"
             export MSGPACK_CXX_VERSION="MSGPACK_CXX14=ON"
             ;;
           3)
@@ -153,7 +153,7 @@ jobs:
             export MSGPACK_USE_STD_VARIANT_ADAPTOR="MSGPACK_USE_STD_VARIANT_ADAPTOR=ON"
             ;;
           4)
-            export CXX="clang++-10"
+            export CXX="clang++"
             export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
             export NO_BOOST="-DMSGPACK_NO_BOOST"
             ;;
@@ -162,7 +162,7 @@ jobs:
             export ARCH=32
             ;;
           6)
-            export CXX="clang++-10"
+            export CXX="clang++"
             export API_VERSION=2
             ;;
           7)
@@ -170,7 +170,7 @@ jobs:
             export API_VERSION=1
             ;;
           8)
-            export CXX="clang++-10"
+            export CXX="clang++"
             export CHAR_SIGN="unsigned"
             ;;
           9)
@@ -178,7 +178,7 @@ jobs:
             export X3_PARSE="ON"
             ;;
           10)
-            export CXX="clang++-10"
+            export CXX="clang++"
             export ACTION="ci/build_regression.sh"
             ;;
           11)
@@ -195,11 +195,11 @@ jobs:
 
   windows:
     name: ${{ format('Windows cxx{0}', matrix.cxx) }}
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
-        # MSVC2019 only supports /std:c++14, /std:c++17 and /std:c++latest
+        # MSVC2022 only supports /std:c++14, /std:c++17 and /std:c++latest
         cxx: [14, 17, 20]
         pp_flag: ["/Zc:preprocessor-", "/Zc:preprocessor"]
     steps:
@@ -228,7 +228,7 @@ jobs:
         md build
         cmake `
             -A x64 `
-            -G "Visual Studio 16 2019" `
+            -G "Visual Studio 17 2022" `
             -D CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" `
             -D MSGPACK_BUILD_TESTS=ON `
             -D $CPPVER `

CMakeLists.txt

@@ -1,12 +1,4 @@
-if(${CMAKE_VERSION} VERSION_GREATER "3.4")
-    CMAKE_MINIMUM_REQUIRED (VERSION 3.5)
-else()
-    CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)
-    IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
-        (CMAKE_VERSION VERSION_EQUAL 3.1))
-        CMAKE_POLICY(SET CMP0054 NEW)
-    ENDIF ()
-endif()
+CMAKE_MINIMUM_REQUIRED (VERSION 3.5...4.0)
 
 PROJECT (msgpack-cxx LANGUAGES CXX)
 
@@ -164,10 +156,10 @@ IF (MSGPACK_BUILD_TESTS)
         MESSAGE(FATAL_ERROR "Test requires -DMSGPACK_USE_BOOST=ON")
     ENDIF ()
     ENABLE_TESTING ()
+    INCLUDE (CTest)
     # MEMORYCHECK_COMMAND_OPTIONS needs to place prior to CTEST_MEMORYCHECK_COMMAND
     SET (MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite,possible --error-exitcode=1")
     FIND_PROGRAM (CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
-    INCLUDE (Dart)
     ADD_SUBDIRECTORY (test)
 ENDIF ()
 

README.md

@@ -2,7 +2,7 @@
 ===================
 
 Version 7.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
-[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master)
+[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://app.codecov.io/gh/msgpack/msgpack-c/tree/cpp_master)
 
 It's like JSON but smaller and faster.
 
@@ -87,7 +87,6 @@ For C++ compiler
 clang++ -DMSGPACK_NO_BOOST your_code.cpp
 ```
 
-
 Usage
 -----
 
@@ -96,7 +95,7 @@ Usage
 
   ```cmake
   # ...
-  find_package(msgpack REQUIRED)
+  find_package(msgpack-cxx REQUIRED)
   # ...
   target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpack-cxx)
   # ...

cmake/CodeCoverage.cmake

@@ -48,7 +48,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
 
     # Show info where to find the report
     ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-        COMMAND ;
+        COMMAND ${CMAKE_COMMAND} -E echo ""
         COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
     )
 

codecov.yml

@@ -31,6 +31,6 @@ ignore:
   - "erb"
   - "ci"
   - "cmake"
-  - "examle"
+  - "example"
   - "external"
   - "usr"

include/msgpack/v1/adaptor/cpp11/timespec.hpp

@@ -13,7 +13,6 @@
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
 #include "msgpack/object.hpp"
-#include "msgpack/object.hpp"
 
 #include <ctime>
 

include/msgpack/v1/cpp_config_decl.hpp

@@ -87,6 +87,7 @@ struct is_pointer;
 
 #include <memory>
 #include <tuple>
+#include <type_traits>
 
 namespace msgpack {
 /// @cond

include/msgpack/v1/fbuffer.hpp

@@ -31,6 +31,7 @@ public:
     {
         MSGPACK_ASSERT(buf || len == 0);
         if (!buf) return;
+        if (len == 0) return;
         if (1 != fwrite(buf, len, 1, m_file)) {
             throw std::runtime_error("fwrite() failed");
         }

include/msgpack/v1/object.hpp

@@ -32,11 +32,11 @@ struct object_kv {
     msgpack::object val;
 };
 
-struct object::with_zone : msgpack::object {
-    with_zone(msgpack::zone& z) : zone(z) { }
+struct object_with_zone_type : msgpack::object {
+    object_with_zone_type(msgpack::zone& z) : zone(z) { }
     msgpack::zone& zone;
 private:
-    with_zone();
+    object_with_zone_type();
 };
 
 

include/msgpack/v1/object_fwd.hpp

@@ -68,6 +68,8 @@ public:
 
 #endif // !defined(MSGPACK_USE_CPP03)
 
+struct object_with_zone_type;
+
 /// Object class that corresponding to MessagePack format object
 /**
  * See https://github.com/msgpack/msgpack-c/wiki/v1_1_cpp_object
@@ -219,7 +221,8 @@ struct object {
     template <typename T>
     object& operator=(const T& v);
 
-    struct with_zone;
+    // Not a nested struct (i.e. 'struct with_zone;') to work around MSVC C++20 modules error C2504
+    typedef object_with_zone_type with_zone;
 
 protected:
     struct implicit_type;

test/buffer.cpp

@@ -90,6 +90,7 @@ BOOST_AUTO_TEST_CASE(fbuffer)
     fbuf.write("a", 1);
     fbuf.write("a", 1);
     fbuf.write("a", 1);
+    fbuf.write("", 0);
 
     fflush(file);
     rewind(file);