Merge branch 'release/0.2.2'

michaelspiss · Mar 31, 2019 · 5c92b21 · 5c92b21
2 parents 2fc3517 + 893574a
commit 5c92b21
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.2
+
+- Merge #10, fix string with leading escaped character
+
 ## 0.2.1
 
 - Fix #4, bug that prevented mailboxes with spaces from being opened

diff --git a/lib/src/imap_buffer.dart b/lib/src/imap_buffer.dart
@@ -103,19 +103,16 @@ class ImapBuffer {
     List<int> charCodes = <int>[];
     int nextChar = await _getCharCode(proceed: true);
     while (nextChar != 34 /* " */) {
-      charCodes.add(nextChar);
-      nextChar = await _getCharCode(proceed: true);
       if (nextChar == 92 /* \ */) {
         nextChar = await _getCharCode(proceed: true); // skip first backslash
-        if (nextChar == 92 /* \ */ || nextChar == 34 /* " */) {
-          charCodes.add(nextChar);
-          nextChar = await _getCharCode(proceed: true); // skip first backslash
-        } else {
+        if (nextChar != 34 /* " */ && nextChar != 92 /* \ */) {
           // bad format, only escaped backslash or quotation mark are supported
           throw new SyntaxErrorException(
               "Unknown escape sequence \\${String.fromCharCode(nextChar)}");
         }
       }
+      charCodes.add(nextChar);
+      nextChar = await _getCharCode(proceed: true);
     }
     if (autoReleaseBuffer) _releaseUsedBuffer();
     return new ImapWord(ImapWordType.string, String.fromCharCodes(charCodes));

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,12 +1,12 @@
 name: imap_client
 description: An interface to get emails via the imap protocol (version 4rev1)
-version: 0.2.1
+version: 0.2.2
 homepage: https://github.com/michaelspiss/imap_client
 author: Michael Spiss <michaelspiss.dev@mailbox.org>
 documentation:
 
 environment:
-  sdk: '>=2.0.0-dev.63.0 <3.0.0'
+  sdk: '>=2.0.0 <3.0.0'
 
 dependencies:
   logging: ^0.11.3

diff --git a/test/imap_buffer_test.dart b/test/imap_buffer_test.dart
@@ -95,6 +95,11 @@ void main() {
       _controller.add(list);
       expect((await _buffer.readQuotedString()).value, r'A \ backslash \');
     });
+    test('String may start with escaped character', () async {
+      var list = r'"\"A quoted text\""'.codeUnits;
+      _controller.add(list);
+      expect((await _buffer.readQuotedString()).value, '"A quoted text"');
+    });
     test('Throws SyntaxErrorException if a characeter besides ", \\ is escaped',
         () async {
       var list = r'"A bad \format"'.codeUnits;