YQL-19921: Proper handle {} and []

commit_hash:c0d84e9086c46ed6c059307704d44f9f3e5c75b9

1 files changed, 6 insertions, 6 deletions

diff --git a/yt/yql/providers/yt/codec/yt_arrow_converter.cpp b/yt/yql/providers/yt/codec/yt_arrow_converter.cpp
index 2f08546ec35..52ce6e8cea3 100644
--- a/yt/yql/providers/yt/codec/yt_arrow_converter.cpp
+++ b/yt/yql/providers/yt/codec/yt_arrow_converter.cpp
@@ -323,13 +323,13 @@ void SkipYson(TYsonBuffer& buf) {
     case BeginListSymbol: {
         buf.Next();
         for (;;) {
+            if (buf.Current() == EndListSymbol) {
+                break;
+            }
             SkipYson(buf);
             if (buf.Current() == ListItemSeparatorSymbol) {
                 buf.Next();
             }
-            if (buf.Current() == EndListSymbol) {
-                break;
-            }
         }
         buf.Next();
         break;
@@ -339,6 +339,9 @@ void SkipYson(TYsonBuffer& buf) {
         auto originalEnd = buf.Current()  == BeginMapSymbol ? EndMapSymbol : EndAttributesSymbol;
         buf.Next();
         for (;;) {
+            if (buf.Current() == originalEnd) {
+                break;
+            }
             SkipYson(buf);
             YQL_ENSURE(buf.Current() == KeyValueSeparatorSymbol);
             buf.Next();
@@ -346,9 +349,6 @@ void SkipYson(TYsonBuffer& buf) {
             if (buf.Current() == KeyedItemSeparatorSymbol) {
                 buf.Next();
             }
-            if (buf.Current() == originalEnd) {
-                break;
-            }
         }
         buf.Next();
         break;