diff options
| author | Allen Winter <allen.winter@kdab.com> | 2018-07-21 18:48:57 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2018-07-21 18:48:57 -0400 |
| commit | 2edc27a64630c448a7616226f9e11858a2dbc582 (patch) | |
| tree | 3ccdb34f726c350c7ef0d1c6ceb0afbf04080098 | |
| parent | 9ec819134eb43891fbb783bcdf845518cd6c0ee7 (diff) | |
| download | libical-git-2edc27a64630c448a7616226f9e11858a2dbc582.tar.gz | |
src/libicalvcal/vcc.[c,y] - Fix parsing VCF files produced by Outlook
Thanks for your patch bosim
Issue#339
| -rw-r--r-- | ReleaseNotes.txt | 1 | ||||
| -rw-r--r-- | src/libicalvcal/vcc.c | 4 | ||||
| -rw-r--r-- | src/libicalvcal/vcc.y | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e1511fc2..6d1a9957 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -7,6 +7,7 @@ Version 3.0.4: * Fixed icalcomponent_set_comment() and icalcomponent_set_uid() * fix FREQ=MONTHLY;BYMONTH * Skip UTF-8 marker when parsing + * Fix parsing <CR>?<LF> in VCF files produced by Outlook * CMake discovery module for ICU uses pkg-config now Version 3.0.3: diff --git a/src/libicalvcal/vcc.c b/src/libicalvcal/vcc.c index 73571ac0..5740a2de 100644 --- a/src/libicalvcal/vcc.c +++ b/src/libicalvcal/vcc.c @@ -1097,12 +1097,12 @@ int yylex() { case ':': { /* consume all line separator(s) adjacent to each other */ /* ignoring linesep immediately after colon. */ -/* c = lexLookahead(); + c = lexLookahead(); while (strchr("\n",c)) { lexSkipLookahead(); c = lexLookahead(); ++mime_lineNum; - }*/ + } DBG_(("db: COLON\n")); return COLON; } diff --git a/src/libicalvcal/vcc.y b/src/libicalvcal/vcc.y index bbcdd657..a16b4144 100644 --- a/src/libicalvcal/vcc.y +++ b/src/libicalvcal/vcc.y @@ -1063,12 +1063,12 @@ int yylex() { case ':': { /* consume all line separator(s) adjacent to each other */ /* ignoring linesep immediately after colon. */ -/* c = lexLookahead(); + c = lexLookahead(); while (strchr("\n",c)) { lexSkipLookahead(); c = lexLookahead(); ++mime_lineNum; - }*/ + } DBG_(("db: COLON\n")); return COLON; } |