Merge pull request #1560 from Exiv2/main-ReenableSanitizersBuild

Main reenable sanitizers build
This commit is contained in:
Robin Mills 2021-04-18 09:39:18 +01:00 committed by GitHub
commit 04c4c84852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 18 deletions

View File

@ -42,7 +42,7 @@ Fedora_MinGW:
- dnf -y upgrade
- dnf -y install mingw64-gcc-c++ mingw64-filesystem mingw64-expat mingw64-zlib cmake make
script:
- python3 ci/test_build.py --without-tests --cmake-executable "mingw64-cmake" --cmake-options "-DEXIV2_TEAM_EXTRA_WARNINGS=ON -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_WIN_UNICODE=ON " --compilers --shared-libs OFF
- python3 ci/test_build.py --without-tests --cmake-executable "mingw64-cmake" --cmake-options "-DEXIV2_TEAM_EXTRA_WARNINGS=OFF -DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_WIN_UNICODE=ON " --compilers --shared-libs OFF
Debian:
image: debian:9

View File

@ -76,14 +76,14 @@ matrix:
- BUILD_TYPE="Release"
- WITH_VALGRIND=1
#- name: "Ubuntu 20.04 - gcc-9.3 (Release+Sanitizers)"
# os: linux
# dist: focal
# sudo: required
# compiler: gcc
# env:
# - BUILD_TYPE="Release"
# - WITH_SANITIZERS=1
- name: "Ubuntu 20.04 - gcc-9.3 (Release+Sanitizers)"
os: linux
dist: focal
sudo: required
compiler: gcc
env:
- BUILD_TYPE="Release"
- WITH_SANITIZERS=1
- name: "macOS 10.14 - XCode 11.3 (Release)"
os: osx

View File

@ -11,14 +11,14 @@ environment:
ARCHITECTURE: x86_64
UNIT_TESTS: 1
WEBREADY: False
WARNINGS_AS_ERRORS: ON
WARNINGS_AS_ERRORS: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
BUILD: CYGWIN64
INTEGRATION_TESTS: 1
ARCHITECTURE: x86_64
UNIT_TESTS: 1
WEBREADY: False
WARNINGS_AS_ERRORS: ON
WARNINGS_AS_ERRORS: OFF
shallow_clone: true
@ -39,7 +39,7 @@ install:
build_script:
- cmd: set CMD=mkdir -p build
- cmd: set CMD=%CMD%; cd build
- cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated
- cmd: set CMD=%CMD%; cmake .. -G 'Unix Makefiles'
- cmd: set CMD=%CMD%; cmake --build . --config Release
- cmd: rem echo %CMD%
- cd %APPVEYOR_BUILD_FOLDER%
@ -47,7 +47,7 @@ build_script:
- cmd: set CMD=which python3 python
- cmd: set CMD=%CMD%; python --version
- cmd: set CMD=%CMD%; build/bin/exiv2 --verbose --version; pwd ; ls -l
- cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests
- cmd: set CMD=%CMD%; cd build ; cmake --build . --config Release --target python_tests
- cmd: echo %CMD%
- cd %APPVEYOR_BUILD_FOLDER%
- cmd: if "%BUILD%"=="MINGW64" C:\msys64\usr\bin\bash -c "%CMD%"
@ -55,7 +55,7 @@ build_script:
- cmd: set CMD=rm -rf build
- cmd: set CMD=%CMD%; mkdir -p build
- cmd: set CMD=%CMD%; cd build
- cmd: set CMD=%CMD%;cmake .. -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated
- cmd: set CMD=%CMD%;cmake ..
- cmd: set CMD=%CMD%; make
- cmd: set CMD=%CMD%; make python_tests
- cmd: echo %CMD%

View File

@ -658,7 +658,7 @@ static void boxes_check(size_t b,size_t m)
Jp2BoxHeader* pSubBox = (Jp2BoxHeader*) (p+count) ;
// copy data. pointer could be into a memory mapped file which we will decode!
Jp2BoxHeader subBox = *pSubBox ;
Jp2BoxHeader subBox ; memcpy(&subBox,pSubBox,sizeof(subBox));
Jp2BoxHeader newBox = subBox;
if ( count < length ) {

View File

@ -979,10 +979,12 @@ namespace Exiv2 {
std::cerr << "Writing data area for " << key << "\n";
#endif
DataBuf buf = object->pValue()->dataArea();
memcpy(object->pDataArea_, buf.pData_, buf.size_);
if (object->sizeDataArea_ > static_cast<uint32_t>(buf.size_)) {
memset(object->pDataArea_ + buf.size_,
if ( buf.pData_ ) {
memcpy(object->pDataArea_, buf.pData_, buf.size_);
if (object->sizeDataArea_ > static_cast<uint32_t>(buf.size_)) {
memset(object->pDataArea_ + buf.size_,
0x0, object->sizeDataArea_ - buf.size_);
}
}
}
}