Merge pull request #1314 from Exiv2/fix_1307_ASAN_RemoteIo_0.27

fix 1307 ASAN issues with RemoteIo
main
Robin Mills 5 years ago committed by GitHub
commit c07f63c7b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -40,6 +40,10 @@ add_library( exiv2lib_int OBJECT
unused.h
)
if (COMPILER_IS_GCC OR COMPILER_IS_CLANG)
set_source_files_properties(http.cpp PROPERTIES COMPILE_FLAGS -fno-sanitize=address,undefined)
endif()
add_library( exiv2lib
../include/exiv2/config.h
../include/exiv2/exiv2.hpp

@ -1960,8 +1960,9 @@ namespace Exiv2 {
for ( size_t block = 0 ; block < blocks ; block ++ ) {
void* p = p_->blocksMap_[block].getData();
if ( p ) {
nRealData += blockSize ;
memcpy(bigBlock_+(block*blockSize),p,blockSize);
size_t nRead = block==(blocks-1)?p_->size_-nRealData:blockSize;
memcpy(bigBlock_+(block*blockSize),p,nRead);
nRealData += nRead ;
}
}
#ifdef EXIV2_DEBUG_MESSAGES

Loading…
Cancel
Save