From 16bf80b9b1614e7a400b914229768a127dbc1a3e Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Fri, 26 Sep 2025 08:43:44 +0200 Subject: [PATCH] tests/imd: Fix invalid NULL comparison on uintptr_t Use 0 instead of NULL when testing or initializing uintptr_t fields, since NULL is only defined for pointers. "data.3.lzma.bin" file is regenerated using: util/cbfs-compression-tool compress file.bin /tmp/file.lzma.bin lzma dd if=/tmp/file.lzma.bin of=file.lzma.bin skip=8 ibs=1 Change-Id: Ia1e7cc5052e842c7ef97ec7cec34919bbe1e2228 Signed-off-by: Elyes Haouas Reviewed-on: https://review.coreboot.org/c/coreboot/+/89356 Tested-by: build bot (Jenkins) Reviewed-by: Jakub "Kuba" Czapiga --- tests/data/lib/lzma-test/data.3.bin | 4 ++-- tests/data/lib/lzma-test/data.3.lzma.bin | Bin 3865 -> 3859 bytes tests/lib/imd-test.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/data/lib/lzma-test/data.3.bin b/tests/data/lib/lzma-test/data.3.bin index 6da1ac926c..f628a519e0 100644 --- a/tests/data/lib/lzma-test/data.3.bin +++ b/tests/data/lib/lzma-test/data.3.bin @@ -67,7 +67,7 @@ static void test_imd_handle_init(void **state) assert_ptr_equal(imd.lg.r, NULL); /* Small allocations not initialized */ - assert_ptr_equal(imd.sm.limit, NULL); + assert_ptr_equal(imd.sm.limit, 0); assert_ptr_equal(imd.sm.r, NULL); } } @@ -234,7 +234,7 @@ static void test_imd_recover(void **state) const struct imd_entry *lg_entry; /* Fail when the limit for lg was not set. */ - imd.lg.limit = (uintptr_t) NULL; + imd.lg.limit = 0; assert_int_equal(-1, imd_recover(&imd)); /* Set the limit for lg. */ diff --git a/tests/data/lib/lzma-test/data.3.lzma.bin b/tests/data/lib/lzma-test/data.3.lzma.bin index ca20babe82602ccaeccd37c37cd36e40e9b08ddc..f77f5b34b06e4185318b0df09dffac2e75cb3ce5 100644 GIT binary patch delta 3010 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 EI3*I={r~^~ delta 3016 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 KN-Zug5FE6qvfar5 diff --git a/tests/lib/imd-test.c b/tests/lib/imd-test.c index b95b7424a7..1d46f10fe7 100644 --- a/tests/lib/imd-test.c +++ b/tests/lib/imd-test.c @@ -68,7 +68,7 @@ static void test_imd_handle_init(void **state) assert_ptr_equal(imd.lg.r, NULL); /* Small allocations not initialized */ - assert_ptr_equal(imd.sm.limit, NULL); + assert_ptr_equal(imd.sm.limit, 0); assert_ptr_equal(imd.sm.r, NULL); } }