diff options
author | Kent Sutherland <git@ksuther.com> | 2019-05-13 09:29:24 -0500 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2019-05-13 18:06:17 -0400 |
commit | 17c18fc93c7346a4b4bd93c41f3349173a02dd3a (patch) | |
tree | d46c0b6ea21e18c60ce3a6d562dba75928ab4fb4 | |
parent | 234bf4b24168052b97200b1893da9e727fe44b9f (diff) | |
download | libical-git-17c18fc93c7346a4b4bd93c41f3349173a02dd3a.tar.gz |
Revert "src/libical/icalparser.c - include <string.h>"
This reverts commit 81554e81f2422b6d7902c15d9deff49fb6fe787b.
-rwxr-xr-x | scripts/buildtests.sh | 1 | ||||
-rw-r--r-- | src/libical/icalparser.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scripts/buildtests.sh b/scripts/buildtests.sh index f782945d..0bbc2d49 100755 --- a/scripts/buildtests.sh +++ b/scripts/buildtests.sh @@ -327,7 +327,6 @@ SPLINT() { -D"strdup"="" \ -D"strcasecmp"="strcmp" \ -D"strncasecmp"="strncmp" \ - -D"strnlen"="" \ -D"putenv"="" \ -D"unsetenv"="" \ -D"tzset()"=";" \ diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c index d696c2f7..abb5a1d7 100644 --- a/src/libical/icalparser.c +++ b/src/libical/icalparser.c @@ -43,7 +43,6 @@ #include <ctype.h> #include <stddef.h> /* for ptrdiff_t */ #include <stdlib.h> -#include <string.h> /* strnlen() */ #define TMP_BUF_SIZE 80 #define MAX_LINE_LENGTH 8192 /* the maximum number of chars per parser line */ @@ -646,8 +645,8 @@ icalcomponent *icalparser_parse(icalparser *parser, if (line != 0 && strnlen(line, MAX_LINE_LENGTH) >= MAX_LINE_LENGTH) { // Encountered a line that is longer than is reasonable // RFC 5545 Section 3.1 says lines should not be more than 75 octets - // A large maximum length allows for lenient parsing but also prevents - // unbounded memory usage when parsing intentionally malformed data + // A large maximum length allows for lenient parsing but also prevents unbounded memory usage + // when parsing intentionally malformed data icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR); icalmemory_free_buffer(line); line = 0; |