Merge commit '4a0574db63dec8ab4efd9f8525bf1b22baefdfcd' into update-c-blsoc2

Author: t20100

src/c-blosc2/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: FrancescAlted

src/c-blosc2/.gitignore

@@ -6,3 +6,4 @@ cmake-build-*
 /blosc/config.h
 /doc/doxygen/xml/
 /doc/xml
+.vs/

src/c-blosc2/ANNOUNCE.md

@@ -1,24 +1,19 @@
-# Announcing C-Blosc2 2.17.0
+# Announcing C-Blosc2 2.17.1
 A fast, compressed and persistent binary data store library for C.
 
 ## What is new?
 
-This introduces some new features and improvements:
+Several fixes affecting uninitialized memory access and others:
 
-* New b2nd_copy_buffer2() function for copying buffers with typesizes
-  larger than 255.  The previous b2nd_copy_buffer() function is now
-  deprecated and will be removed in a future release.
+* Fix uninitialized memory access in newly added unshuffle12_sse2 and unshuffle12_avx2 functions
+* Fix unaligned access in _sw32 and sw32_
+* Fix DWORD being printed as %s in sprintf call
+* Fix warning on unused variable (since this variable was only being used in the linux branch)
+* `splitmode` variable was uninitialized if goto was triggered
 
-* Support repeated values larger than 8-bit, also for n-dim arrays.
-  This is useful for compressing arrays with large runs of repeated
-  values, like in the case of images with large areas of the same color.
+See PR #658.  Many thanks to @EmilDohne for this nice job.
 
-* Fix a leak in the pthreads emulation for Windows.  Fixes #647.
-  Thanks to @jocbeh for the report and fix (#655).
-
-* Update zstd to 1.5.7.  Thanks to Tom Birch.
-
-For more info, please see the release notes in:
+For more info, see the release notes in:
 
 https://github.com/Blosc/c-blosc2/blob/main/RELEASE_NOTES.md
 

src/c-blosc2/RELEASE_NOTES.md

@@ -1,6 +1,20 @@
 Release notes for C-Blosc2
 ==========================
 
+Changes from 2.17.0 to 2.17.1
+=============================
+
+Several fixes affecting uninitialized memory access and others:
+
+* Fix uninitialized memory access in newly added unshuffle12_sse2 and unshuffle12_avx2 functions
+* Fix unaligned access in _sw32 and sw32_
+* Fix DWORD being printed as %s in sprintf call
+* Fix warning on unused variable (since this variable was only being used in the linux branch)
+* `splitmode` variable was uninitialized if goto was triggered
+
+See PR #658.  Many thanks to @EmilDohne for this nice job.
+
+
 Changes from 2.16.0 to 2.17.0
 =============================
 

src/c-blosc2/blosc/blosc-private.h

@@ -91,7 +91,7 @@ static inline int32_t sw32_(const void* pa) {
 
   bool little_endian = is_little_endian();
   if (little_endian) {
-    idest = *(int32_t *)pa;
+    memcpy(&idest, pa, sizeof(idest));
   }
   else {
 #if defined (__GNUC__)
@@ -116,7 +116,7 @@ static inline void _sw32(void* dest, int32_t a) {
 
   bool little_endian = is_little_endian();
   if (little_endian) {
-    *(int32_t *)dest_ = a;
+    memcpy(dest_, &a, sizeof(a));;
   }
   else {
 #if defined (__GNUC__)
@@ -280,7 +280,7 @@ static inline void* load_lib(char *plugin_name, char *libpath) {
         return loaded_lib;
     } else {
 #if defined(_WIN32)
-        BLOSC_TRACE_INFO("Failed to load %s directly, error: %s\n", libpath, GetLastError());
+        BLOSC_TRACE_INFO("Failed to load %s directly, error: %lu\n", libpath, GetLastError());
 #else
         BLOSC_TRACE_INFO("Failed to load %s directly, error: %s\n", libpath, dlerror());
 #endif

src/c-blosc2/blosc/blosc2-stdio.c

@@ -376,10 +376,11 @@ int64_t blosc2_stdio_mmap_write(const void *ptr, int64_t size, int64_t nitems, i
   }
 
   if (mmap_file->mapping_size < mmap_file->file_size) {
-    int64_t old_mapping_size = mmap_file->mapping_size;
     mmap_file->mapping_size = mmap_file->file_size * 2;
 
 #if defined(__linux__)
+    int64_t old_mapping_size = mmap_file->mapping_size;
+
     /* mremap is the best option as it also ensures that the old data is still available in c mode. Unfortunately, it
     is no POSIX standard and only available on Linux */
     char* new_address = mremap(mmap_file->addr, old_mapping_size, mmap_file->mapping_size, MREMAP_MAYMOVE);

src/c-blosc2/blosc/directories.c

@@ -102,7 +102,12 @@ int blosc2_remove_dir(const char* dir_path) {
   char* fname;
   while ((de = readdir(dr)) != NULL) {
     fname = malloc(strlen(path) + strlen(de->d_name) + 1);
-    sprintf(fname, "%s%s", path, de->d_name);
+    if (path != NULL) {
+      sprintf(fname, "%s%s", path, de->d_name);
+    }
+    else {
+      sprintf(fname, "%s", de->d_name);
+    }
     if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) {
       free(fname);
       continue;

src/c-blosc2/blosc/frame.c

@@ -3186,8 +3186,8 @@ void* frame_update_chunk(blosc2_frame_s* frame, int64_t nchunk, void* chunk, blo
       return NULL;
     }
   }
-  int32_t cbytes_old;
-  int64_t old_offset;
+  int32_t cbytes_old = 0;
+  int64_t old_offset = 0;
   if (!frame->sframe) {
     // See how big would be the space
     old_offset = offsets[nchunk];

src/c-blosc2/blosc/shuffle-avx2.c

@@ -540,11 +540,15 @@ unshuffle12_avx2(uint8_t* const dest, const uint8_t* const src,
   __m256i store_mask = _mm256_set_epi32(0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
   int32_t jump = 2*bytesoftype;
   for (i = 0; i < vectorizable_elements; i += sizeof(__m256i)) {
-    /* Fetch 32 elements (512 bytes) into 16 YMM registers. */
+    /* Fetch 24 elements (384 bytes) into 12 YMM registers. */
     const uint8_t* const src_for_ith_element = src + i;
     for (j = 0; j < bytesoftype; j++) {
       ymm0[j] = _mm256_loadu_si256((__m256i*)(src_for_ith_element + (j * total_elements)));
     }
+    /* Initialize the last 4 registers (128 bytes) to null */
+    for (j = bytesoftype; j < 16; j++) {
+      ymm0[j] = _mm256_setzero_si256();
+    }
 
     /* Shuffle bytes */
     for (j = 0; j < 8; j++) {

src/c-blosc2/blosc/shuffle-sse2.c

@@ -379,11 +379,15 @@ unshuffle12_sse2(uint8_t* const dest, const uint8_t* const src,
   __m128i mask = _mm_set_epi8( 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff);
 
   for (i = 0; i < vectorizable_elements; i += sizeof(__m128i)) {
-    /* Load 16 elements (256 bytes) into 16 XMM registers. */
+    /* Load 12 elements (192 bytes) into 12 XMM registers. */
     const uint8_t* const src_for_ith_element = src + i;
     for (j = 0; j < bytesoftype; j++) {
       xmm1[j] = _mm_loadu_si128((__m128i*)(src_for_ith_element + (j * total_elements)));
     }
+    /* Initialize the last 4 registers (64 bytes) to null */
+    for (j = bytesoftype; j < 16; j++) {
+      xmm1[j] = _mm_setzero_si128();
+    }
     /* Shuffle bytes */
     for (j = 0; j < 8; j++) {
       /* Compute the low 32 bytes */