Add a test for API code

Author: flanglet

src/CMakeLists.txt

@@ -73,6 +73,7 @@ set(TEST_SOURCES
     test/TestCompressedStream.cpp
     test/TestDefaultBitStream.cpp
     test/TestTransforms.cpp
+    test/TestAPI.cpp
 )
 
 set(APP_SOURCES
@@ -110,6 +111,9 @@ target_link_libraries(testDefaultBitStream libkanzi)
 add_executable(testCompressedStream test/TestCompressedStream.cpp)
 target_link_libraries(testCompressedStream libkanzi)
 
+add_executable(testAPI test/TestAPI.cpp)
+target_link_libraries(testAPI libkanzi)
+
 # Main executable
 
 # Dynamically linked executable
@@ -128,7 +132,7 @@ target_link_libraries(kanzi_static libkanzi)
 
 # Custom target to build all tests
 add_custom_target(test
-    DEPENDS testBWT testTransforms testEntropyCodec testDefaultBitStream testCompressedStream
+    DEPENDS testBWT testTransforms testEntropyCodec testDefaultBitStream testCompressedStream testAPI
 )
 # Custom target to build static libraries
 add_custom_target(static_lib

src/Makefile

@@ -1,4 +1,4 @@
-#CXX=clang++
+CXX=clang++
 OBJ_DIR = obj
 TEST_OBJ_DIR=$(OBJ_DIR)/test
 APP=kanzi
@@ -25,7 +25,7 @@ else
 		CXXFLAGS=-c -std=c++14 -Wall -Wextra -O3 -fomit-frame-pointer -fPIC -DNDEBUG -pedantic -march=native -fno-rtti $(CONCURRENCY_FLAG)
 	else
 		#CXXFLAGS=-c -std=c++17 -fsanitize=signed-integer-overflow -ftrapv -D_FORTIFY_SOURCE=3 -Wall -Wextra -O3 -fPIC -DNDEBUG -pedantic -fno-rtti $(CONCURRENCY_FLAG)
-		CXXFLAGS=-c -std=c++17 -fstrict-aliasing -Wall -Wextra -Wpedantic -Wdeprecated -O3 -fPIC -DNDEBUG -pedantic -fno-rtti $(CONCURRENCY_FLAG)
+		CXXFLAGS=-c -std=c++17 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST -fstrict-aliasing -Wall -Wextra -Wpedantic -Wdeprecated -O3 -fPIC -DNDEBUG -pedantic -fno-rtti $(CONCURRENCY_FLAG)
 	endif
 endif	
 
@@ -151,6 +151,9 @@ $(SHARED_DECOMP_LIB):$(LIB_DECOMP_OBJECTS)
 
 
 # Targets for test executables
+testAPI: $(LIB_OBJECTS) $(TEST_OBJ_DIR)/TestAPI.o
+	$(CXX) $^ -o ../bin/$@ $(LDFLAGS)
+
 testBWT: $(LIB_OBJECTS) $(TEST_OBJ_DIR)/TestBWT.o
 	$(CXX) $^ -o ../bin/$@ $(LDFLAGS)
 
@@ -166,7 +169,7 @@ testDefaultBitStream: $(LIB_OBJECTS) $(TEST_OBJ_DIR)/TestDefaultBitStream.o
 testCompressedStream: $(LIB_OBJECTS) $(TEST_OBJ_DIR)/TestCompressedStream.o
 	$(CXX) $^ -o ../bin/$@ $(LDFLAGS)
 
-test: testBWT testTransforms testEntropyCodec testDefaultBitStream testCompressedStream
+test: testAPI testBWT testTransforms testEntropyCodec testDefaultBitStream testCompressedStream
 
 # Target for the main application
 kanzi: $(LIB_OBJECTS) $(APP_OBJECTS)

src/api/Decompressor.cpp

@@ -37,10 +37,12 @@ using namespace std;
 using namespace kanzi;
 
 namespace kanzi {
+
    class ifstreambuf : public streambuf {
      public:
        ifstreambuf(int fd) : _fd(fd) {
-           setg(&_buffer[4], &_buffer[4], &_buffer[4]);
+          // gptr() = egptr() initially forces underflow() on first read
+          setg(_buffer + 4, _buffer + 4, _buffer + 4);
        }
 
      private:
@@ -52,28 +54,26 @@ namespace kanzi {
            if (gptr() < egptr())
                return traits_type::to_int_type(*gptr());
 
-           // Number of characters to preserve (putback)
+           // Preserve up to 4 characters for putback
            int putback = int(gptr() - eback());
 
            if (putback > 4) putback = 4;
 
-           // Prevent reading before buffer start
-           const char* src = gptr() - putback;
-
-           if (src < _buffer) {
-               putback = int(gptr() - _buffer);
-               src = _buffer;
+           // Only move putback if > 0
+           if (putback > 0) {
+               std::memmove(_buffer + (4 - putback), gptr() - putback, putback);
            }
 
-           // Move putback characters to start of buffer
-           std::memmove(_buffer + (4 - putback), src, putback);
-
-           // Read new characters into buffer
+           // Read new data
            const int n = int(READ(_fd, _buffer + 4, BUF_SIZE - 4));
 
            if (n <= 0)
                return EOF;
 
+           // Reset get pointers:
+           //   eback = start of buffer (including putback area)
+           //   gptr  = first new byte
+           //   egptr = end of new data
            setg(_buffer + (4 - putback), _buffer + 4, _buffer + 4 + n);
            return traits_type::to_int_type(*gptr());
        }