diff --git a/.github/workflows/ci-unix-static-sanitized.yml b/.github/workflows/ci-unix-static-sanitized.yml index b9c5db336a..90c8d989ba 100644 --- a/.github/workflows/ci-unix-static-sanitized.yml +++ b/.github/workflows/ci-unix-static-sanitized.yml @@ -84,6 +84,11 @@ jobs: run: | sed -i -e 's/cmake -S \(.*\)/cmake -S \1 -DWITH_SIMD=OFF/g' libjpeg.cmd ./libjpeg.cmd + env: + CFLAGS: ${{ env.CI_CFLAGS }} + CXXFLAGS: ${{ env.CI_CXXFLAGS }} + LDFLAGS: ${{ env.CI_LDFLAGS }} + LD_LIBRARY_PATH: ${{ env.CI_LD_LIBRARY_PATH }} - name: Build aom for msan if: ${{ (steps.cache-hit.outputs.hit == 'false') && (matrix.sanitizer == 'memory')}} diff --git a/apps/shared/avifjpeg.c b/apps/shared/avifjpeg.c index 024c911a32..262d297e41 100644 --- a/apps/shared/avifjpeg.c +++ b/apps/shared/avifjpeg.c @@ -948,6 +948,7 @@ static avifBool avifJPEGReadInternal(FILE * f, int row_stride = cinfo.output_width * cinfo.output_components; JSAMPARRAY buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr)&cinfo, JPOOL_IMAGE, row_stride, 1); + AVIF_ANNOTATE_MEMORY_IS_INITIALIZED(buffer, row_stride); avif->width = cinfo.output_width; avif->height = cinfo.output_height; @@ -994,6 +995,7 @@ static avifBool avifJPEGReadInternal(FILE * f, goto cleanup; } uint8_t * pixelRow = &rgb.pixels[row * rgb.rowBytes]; + AVIF_ANNOTATE_MEMORY_IS_INITIALIZED(buffer, sizeof(buffer[0])); AVIF_ANNOTATE_MEMORY_IS_INITIALIZED(buffer[0], rgb.rowBytes); memcpy(pixelRow, buffer[0], rgb.rowBytes); ++row;