skip_space issue

danielaparker · Nov 15, 2024 · 3530245 · 3530245
1 parent 9e6db17
commit 3530245
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/include/jsoncons/json_parser.hpp b/include/jsoncons/json_parser.hpp
@@ -297,6 +297,7 @@ class basic_json_parser : public ser_context, public virtual basic_parser_input<
 
     void skip_space(std::error_code& ec)
     {
+        bool got_cr = false;
         const char_type* local_input_end = input_end_;
         while (true) 
         {
@@ -316,17 +317,25 @@ class basic_json_parser : public ser_context, public virtual basic_parser_input<
                     ++position_;
                     break;
                 case '\r': 
-                    push_state(state_);
                     ++input_ptr_;
+                    ++line_;
                     ++position_;
-                    state_ = json_parse_state::cr;
-                    return; 
+                    mark_position_ = position_;
+                    got_cr = true;
+                    break; 
                 case '\n': 
                     ++input_ptr_;
-                    ++line_;
+                    if (got_cr)
+                    {
+                        got_cr = false;
+                    }
+                    else
+                    {
+                        ++line_;
+                    }
                     ++position_;
                     mark_position_ = position_;
-                    return;   
+                    break;   
                 default:
                     return;
             }
@@ -335,6 +344,7 @@ class basic_json_parser : public ser_context, public virtual basic_parser_input<
 
     void skip_whitespace(std::error_code& ec)
     {
+        bool got_cr = false;
         const char_type* local_input_end = input_end_;
 
         while (true) 

diff --git a/include/jsoncons/json_reader.hpp b/include/jsoncons/json_reader.hpp
@@ -321,7 +321,7 @@ namespace jsoncons {
 
             while (!source_.eof())
             {
-                parser_.skip_whitespace(ec);
+                parser_.skip_space(ec);
                 if (parser_.source_exhausted())
                 {
                     auto s1 = source_.read_buffer(ec);