Guard malloc in compression filters

JuliaIO · May 27, 2024 · 504ce58 · 504ce58
1 parent eaf6641
commit 504ce58
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/filters/H5Zbitshuffle/src/H5Zbitshuffle.jl b/filters/H5Zbitshuffle/src/H5Zbitshuffle.jl
@@ -196,6 +196,7 @@ function H5Z_filter_bitshuffle(
         end
 
         size = nbytes_uncomp ÷ elem_size
+        buf_size_out <= 0 && error("bitshuffle_h5plugin: Non-positive buf_size_out for malloc: $buf_size_out")
         out_buf = Libc.malloc(buf_size_out)
         if out_buf == C_NULL
             error(

diff --git a/filters/H5Zblosc/src/H5Zblosc.jl b/filters/H5Zblosc/src/H5Zblosc.jl
@@ -96,6 +96,7 @@ function blosc_filter(
         # the result is larger, we simply return 0. The filter is flagged
         # as optional, so HDF5 marks the chunk as uncompressed and proceeds.
         outbuf_size = unsafe_load(buf_size)
+        outbuf_size <= 0 && return Csize_t(0)
         outbuf = Libc.malloc(outbuf_size)
         outbuf == C_NULL && return Csize_t(0)
 
@@ -121,6 +122,7 @@ function blosc_filter(
         # See https://github.com/JuliaLang/julia/issues/43402
         # Resolved in https://github.com/JuliaLang/julia/pull/43408
         outbuf_size, cbytes, blocksize = Blosc.cbuffer_sizes(in)
+        outbuf_size <= && return Csize_t(0)
         outbuf = Libc.malloc(outbuf_size)
         outbuf == C_NULL && return Csize_t(0)
         status = Blosc.blosc_decompress(in, outbuf, outbuf_size)

diff --git a/filters/H5Zbzip2/src/H5Zbzip2.jl b/filters/H5Zbzip2/src/H5Zbzip2.jl
@@ -40,6 +40,7 @@ function H5Z_filter_bzip2(
             # Decompress
 
             outbuflen = nbytes * 3 + 1
+            outbuflen <= 0 && error("H5Zbzip2: Non-positive outbuflen for malloc: $outbuflen.")
             outbuf = Libc.malloc(outbuflen)
             if outbuf == C_NULL
                 error("H5Zbzip2: memory allocation failed for bzip2 decompression.")
@@ -106,6 +107,7 @@ function H5Z_filter_bzip2(
 
             # Prepare the output buffer
             outbuflen = nbytes + nbytes ÷ 100 + 600 # worse case (bzip2 docs)
+            outbuflen <= 0 && error("H5Zbzip2: Non-positive outbuflen for malloc: $outbuflen.")
             outbuf = Libc.malloc(outbuflen)
             @debug "Allocated" outbuflen outbuf
             if outbuf == C_NULL

diff --git a/filters/H5Zlz4/src/H5Zlz4.jl b/filters/H5Zlz4/src/H5Zlz4.jl
@@ -66,7 +66,9 @@ function H5Z_filter_lz4(
             # malloc a byte buffer of origSize
             # outBuf = Vector{UInt8}(undef, origSize)
             @debug "OrigSize" origSize
+            origSize <= 0 && error("H5Zlz4: Non-positive origSize for malloc: $origSize")
             outBuf = Libc.malloc(origSize)
+            outBuf == C_NULL && error("H5Zlz4: Could not allocate memory via malloc")
             # Julia should throw an error if it cannot allocate this
             roBuf = Ptr{UInt8}(outBuf)
             decompSize = 0
@@ -126,7 +128,9 @@ function H5Z_filter_lz4(
             nBlocks = (nbytes - 1) ÷ blockSize + 1
             maxDestSize =
                 nBlocks * CodecLz4.LZ4_compressBound(blockSize) + 4 + 8 + nBlocks * 4
+            maxDestSize <= 0 && error("H5Zlz4: Non-positive maxDestSize for malloc: $maxDestSize")
             outBuf = Libc.malloc(maxDestSize)
+            outBuf == C_NULL && error("H5Zlz4: Could not allocate memory via malloc")
 
             rpos = Ptr{UInt8}(unsafe_load(buf))
             roBuf = Ptr{UInt8}(outBuf)
@@ -189,7 +193,7 @@ function H5Z_filter_lz4(
     catch err
         #  "In the case of failure, the return value is 0 (zero) and all pointer arguments are left unchanged."
         ret_value = Csize_t(0)
-        @error "H5Zlz4.jl Non-Fatal ERROR: " err
+        @async @error "H5Zlz4.jl Non-Fatal ERROR: " err
         display(stacktrace(catch_backtrace()))
     finally
         if outBuf != C_NULL