diff options
| author | Allen Winter <allen.winter@kdab.com> | 2022-10-10 15:01:30 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2022-10-10 15:01:30 -0400 |
| commit | b38b67e0097e5cb37a45a53448115586ed0652f3 (patch) | |
| tree | 82f1926fa53de0abaafa32ea5a79b06fa0b22354 | |
| parent | d88b09622acf637b07fa86714f9fad9618f8d6e4 (diff) | |
| parent | eeccee80d0485bdd3951924b294a82e8bc39a5f8 (diff) | |
| download | libical-git-b38b67e0097e5cb37a45a53448115586ed0652f3.tar.gz | |
Merge branch '3.0'
| -rw-r--r-- | ReleaseNotes.txt | 4 | ||||
| -rw-r--r-- | src/libical/icalparser.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 51d8a44d..3e53453d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -56,7 +56,7 @@ Version 3.1.0 (NOT RELEASED YET): Version 3.0.16 (UNRELEASED): ---------------------------- - * + * Fix a regression in 3.0.15 that limited how many lines could be processed in one call to icalparser_parse() Version 3.0.15 (06 October 2022): --------------------------------- @@ -66,7 +66,7 @@ Version 3.0.15 (06 October 2022): to work properly between years 1902 and 10k. * Fix x-property comma handling and escaping * Built-in timezones updated to tzdata2022d (now with a VTIMEZONE for each time zone alias) - * Fix fuzzer issues + * Fix a fuzzer issue * Handle unreachable-code compile warnings with clang * Ensure all vanew_foo() calls finish with (void*)0 (not 0) diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c index 8f8c7ea1..2ae783fd 100644 --- a/src/libical/icalparser.c +++ b/src/libical/icalparser.c @@ -627,7 +627,6 @@ icalcomponent *icalparser_parse(icalparser *parser, icalparser_line_gen_func line_gen_func) { char *line; - unsigned int cnt = 0; icalcomponent *c = 0; icalcomponent *root = 0; icalerrorstate es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR); @@ -638,7 +637,6 @@ icalcomponent *icalparser_parse(icalparser *parser, icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_NONFATAL); do { - cnt++; line = icalparser_get_line(parser, line_gen_func); if ((c = icalparser_add_line(parser, line)) != 0) { @@ -678,7 +676,7 @@ icalcomponent *icalparser_parse(icalparser *parser, icalmemory_free_buffer(line); cont = 1; } - } while (cont && cnt < TMP_BUF_SIZE); + } while (cont); icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, es); |