libical/backport-icalcomponent.c-avoid-crashing-in-icalcomponent_normalize.patch
2024-08-28 09:11:38 +00:00

29 lines
961 B
Diff

From d8345bffcbf5a7e550388c7354818caed4a1e8ad Mon Sep 17 00:00:00 2001
From: Allen Winter <winter@kde.org>
Date: Sun, 2 Jun 2024 10:35:02 -0400
Subject: [PATCH] icalcomponent.c - avoid crashing in icalcomponent_normalize
Avoid a crash in icalcomponent_normalize() by returning
immediately if the specified component in NULL.
Should fix fuzzer issues 52787 and 56539.
---
src/libical/icalcomponent.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libical/icalcomponent.c b/src/libical/icalcomponent.c
index 8fc61a330..be524767d 100644
--- a/src/libical/icalcomponent.c
+++ b/src/libical/icalcomponent.c
@@ -2628,6 +2628,10 @@ void icalcomponent_normalize(icalcomponent *comp)
icalproperty *prop;
icalcomponent *sub;
+ icalerror_check_arg(comp != 0, "comp");
+ if (!comp)
+ return;
+
/* Normalize properties into sorted list */
while ((prop = pvl_pop(comp->properties)) != 0) {
int nparams, remove = 0;