diff options
| author | Ken Murchison <murch@fastmail.com> | 2022-01-17 16:22:58 -0500 |
|---|---|---|
| committer | Ken Murchison <murch@fastmail.com> | 2022-01-17 16:22:58 -0500 |
| commit | 58f1ea33d94d875a1a1c4f5296c7350943caad79 (patch) | |
| tree | 3cdee34531d18a29f9d6549e7b05b64058bf18c5 | |
| parent | f82b6b53d71e33149c3d1fa2cb000b44206dab56 (diff) | |
| download | libical-git-restriction_depth_fix.tar.gz | |
icalrestriction.c.in: no need to iterate all props/comps if no restriction for method/comprestriction_depth_fix
| -rw-r--r-- | src/libical/icalrestriction.c.in | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/src/libical/icalrestriction.c.in b/src/libical/icalrestriction.c.in index 533ac0fa..a213a741 100644 --- a/src/libical/icalrestriction.c.in +++ b/src/libical/icalrestriction.c.in @@ -416,20 +416,24 @@ static int icalrestriction_check_component(icalproperty_method method, ICAL_ANY_PROPERTY, ICAL_NO_COMPONENT); - for (prop_kind = ICAL_ANY_PROPERTY + 1; - prop_kind != ICAL_NO_PROPERTY; prop_kind++) { + if (start_record != &null_restriction_record) { - const icalrestriction_record *record = - icalrestriction_get_restriction(start_record, method, comp_kind, - prop_kind, ICAL_NO_COMPONENT); + for (prop_kind = ICAL_ANY_PROPERTY + 1; + prop_kind != ICAL_NO_PROPERTY; prop_kind++) { - icalproperty *prop = icalcomponent_get_first_property(comp, prop_kind); + const icalrestriction_record *record = + icalrestriction_get_restriction(start_record, method, comp_kind, + prop_kind, ICAL_NO_COMPONENT); - count = icalcomponent_count_properties(comp, prop_kind); + icalproperty *prop = + icalcomponent_get_first_property(comp, prop_kind); - compare = _check_restriction(comp, record, count, prop); + count = icalcomponent_count_properties(comp, prop_kind); - valid = valid && compare; + compare = _check_restriction(comp, record, count, prop); + + valid = valid && compare; + } } /* Now check the inner components */ @@ -438,18 +442,21 @@ static int icalrestriction_check_component(icalproperty_method method, ICAL_NO_PROPERTY, ICAL_ANY_COMPONENT); - for (inner_kind = ICAL_NO_COMPONENT + 3; - inner_kind != ICAL_NUM_COMPONENT_TYPES; inner_kind++) { + if (start_record != &null_restriction_record) { - const icalrestriction_record *record = - icalrestriction_get_restriction(start_record, method, comp_kind, - ICAL_NO_PROPERTY, inner_kind); + for (inner_kind = ICAL_NO_COMPONENT + 3; + inner_kind != ICAL_NUM_COMPONENT_TYPES; inner_kind++) { - count = icalcomponent_count_components(comp, inner_kind); + const icalrestriction_record *record = + icalrestriction_get_restriction(start_record, method, comp_kind, + ICAL_NO_PROPERTY, inner_kind); - compare = _check_restriction(comp, record, count, NULL); + count = icalcomponent_count_components(comp, inner_kind); - valid = valid && compare; + compare = _check_restriction(comp, record, count, NULL); + + valid = valid && compare; + } } if (method_prop == 0) { |