MdePkg/DebugLib: Add null pointer check to CR macro

- Added a null pointer check in the CR macro. - If Record is NULL, an assertion is triggered. - This change improves the CR by preventing dereferencing of null pointers. REF: #10510 Signed-off-by: Richard Lyu <[email protected]>
tianocore · Jan 7, 2025 · d2a9618 · d2a9618
1 parent f6e19ab
commit d2a9618
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
@@ -657,11 +657,12 @@ UnitTestDebugAssert (
 **/
 #if !defined (MDEPKG_NDEBUG)
 #define CR(Record, TYPE, Field, TestSignature)                                              \
+    ((Record == NULL) ? (TYPE *) (_ASSERT (CR has Null Pointer), Record) :                             \
     (DebugAssertEnabled () && (BASE_CR (Record, TYPE, Field)->Signature != TestSignature)) ?  \
     (TYPE *) (_ASSERT (CR has Bad Signature), Record) :                                       \
     (BASE_CR (Record, TYPE, Field)->Signature != TestSignature) ?                             \
     NULL :                                                                                    \
-    BASE_CR (Record, TYPE, Field)
+    BASE_CR (Record, TYPE, Field))
 #else
 #define CR(Record, TYPE, Field, TestSignature)                                              \
     (BASE_CR (Record, TYPE, Field)->Signature != TestSignature) ?                           \