fix: do not perform lossy casts on row/col info

src/scanner.c

@@ -2,7 +2,7 @@
 #include "tree_sitter/parser.h"
 
 #define _str(x) #x
-#define _file(x) _str(./schema.x.c)
+#define _file(x) _str(schema.x.c)
 
 #ifndef YAML_SCHEMA
 #define YAML_SCHEMA core
@@ -152,20 +152,27 @@ typedef struct {
 } Scanner;
 
 static unsigned serialize(Scanner *scanner, char *buffer) {
-    size_t i = 0;
+    size_t size = 0;
-    buffer[i++] = (char)scanner->row;
+    *(int16_t *)&buffer[size] = scanner->row;
-    buffer[i++] = (char)scanner->col;
+    size += sizeof(int16_t);
-    buffer[i++] = (char)scanner->blk_imp_row;
+    *(int16_t *)&buffer[size] = scanner->col;
-    buffer[i++] = (char)scanner->blk_imp_col;
+    size += sizeof(int16_t);
-    buffer[i++] = (char)scanner->blk_imp_tab;
+    *(int16_t *)&buffer[size] = scanner->blk_imp_row;
+    size += sizeof(int16_t);
+    *(int16_t *)&buffer[size] = scanner->blk_imp_col;
+    size += sizeof(int16_t);
+    *(int16_t *)&buffer[size] = scanner->blk_imp_tab;
+    size += sizeof(int16_t);
     int16_t *typ_itr = scanner->ind_typ_stk.contents + 1;
     int16_t *typ_end = scanner->ind_typ_stk.contents + scanner->ind_typ_stk.size;
     int16_t *len_itr = scanner->ind_len_stk.contents + 1;
-    for (; typ_itr != typ_end && i < TREE_SITTER_SERIALIZATION_BUFFER_SIZE; ++typ_itr, ++len_itr) {
+    for (; typ_itr != typ_end && size < TREE_SITTER_SERIALIZATION_BUFFER_SIZE; ++typ_itr, ++len_itr) {
-        buffer[i++] = (char)*typ_itr;
+        *(int16_t *)&buffer[size] = *typ_itr;
-        buffer[i++] = (char)*len_itr;
+        size += sizeof(int16_t);
+        *(int16_t *)&buffer[size] = *len_itr;
+        size += sizeof(int16_t);
     }
-    return i;
+    return size;
 }
 
 static void deserialize(Scanner *scanner, const char *buffer, unsigned length) {
@@ -179,16 +186,24 @@ static void deserialize(Scanner *scanner, const char *buffer, unsigned length) {
     array_delete(&scanner->ind_len_stk);
     array_push(&scanner->ind_len_stk, -1);
     if (length > 0) {
-        size_t i = 0;
+        size_t size = 0;
-        scanner->row = (int16_t)buffer[i++];
+        scanner->row = *(int16_t *)&buffer[size];
-        scanner->col = (int16_t)buffer[i++];
+        size += sizeof(int16_t);
-        scanner->blk_imp_row = (int16_t)buffer[i++];
+        scanner->col = *(int16_t *)&buffer[size];
-        scanner->blk_imp_col = (int16_t)buffer[i++];
+        size += sizeof(int16_t);
-        scanner->blk_imp_tab = (int16_t)buffer[i++];
+        scanner->blk_imp_row = *(int16_t *)&buffer[size];
-        while (i < length) {
+        size += sizeof(int16_t);
-            array_push(&scanner->ind_typ_stk, (int16_t)buffer[i++]);
+        scanner->blk_imp_col = *(int16_t *)&buffer[size];
-            array_push(&scanner->ind_len_stk, (int16_t)buffer[i++]);
+        size += sizeof(int16_t);
+        scanner->blk_imp_tab = *(int16_t *)&buffer[size];
+        size += sizeof(int16_t);
+        while (size < length) {
+            array_push(&scanner->ind_typ_stk, *(int16_t *)&buffer[size]);
+            size += sizeof(int16_t);
+            array_push(&scanner->ind_len_stk, *(int16_t *)&buffer[size]);
+            size += sizeof(int16_t);
         }
+        assert(size == length);
     }
 }
 

test/corpus/08_blocks.txt

@@ -73,21 +73,6 @@ Block Indentation Indicator
           (block_node
             (block_scalar)))))))
 
-================================================================================
-Invalid Block Scalar Indentation Indicators
-:error
-================================================================================
-- |
-
- text
-- >
-  text
- text
-- |2
- text
-
---------------------------------------------------------------------------------
-
 ================================================================================
 Chomping Final Line Break
 ================================================================================
@@ -186,8 +171,8 @@ keep: |+
               (string_scalar)))
           (block_node
             (block_scalar)))
-(comment)
+        (comment)
-(comment)))))
+        (comment)))))
 
 ================================================================================
 Empty Scalar Chomping
@@ -468,38 +453,38 @@ Block Sequence Entry Types
 --------------------------------------------------------------------------------
 
 (stream
-(document
+  (document
-(block_node
+    (block_node
-(block_sequence
+      (block_sequence
-(block_sequence_item)
+        (block_sequence_item)
-(comment)
+        (comment)
-(block_sequence_item
+        (block_sequence_item
-(block_node
+          (block_node
-(block_scalar)))
+            (block_scalar)))
-(block_sequence_item
+        (block_sequence_item
-(block_node
+          (block_node
-(block_sequence
+            (block_sequence
-(block_sequence_item
+              (block_sequence_item
-(flow_node
+                (flow_node
-(plain_scalar
+                  (plain_scalar
-(string_scalar))))
+                    (string_scalar))))
-(comment)
+              (comment)
-(block_sequence_item
+              (block_sequence_item
-(flow_node
+                (flow_node
-(plain_scalar
+                  (plain_scalar
-(string_scalar))))
+                    (string_scalar))))
-(comment))))
+              (comment))))
-(block_sequence_item
+        (block_sequence_item
-(block_node
+          (block_node
-(block_mapping
+            (block_mapping
-(block_mapping_pair
+              (block_mapping_pair
-(flow_node
+                (flow_node
-(plain_scalar
+                  (plain_scalar
-(string_scalar)))
+                    (string_scalar)))
-(flow_node
+                (flow_node
-(plain_scalar
+                  (plain_scalar
-(string_scalar))))
+                    (string_scalar))))
-(comment))))))))
+              (comment))))))))
 
 ================================================================================
 Block Mappings
@@ -768,3 +753,30 @@ mapping: !!map
                 (flow_node
                   (plain_scalar
                     (string_scalar)))))))))))
+
+================================================================================
+Long string scalar (> SCHAR_MAX in length)
+================================================================================
+
+long:
+  abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdef1234567890!@#$%^&*()_+{}|:"<>?`-=[]\;',./almostat128chars!:
+    {}
+
+---
+
+(stream
+  (document
+    (block_node
+      (block_mapping
+        (block_mapping_pair
+          (flow_node
+            (plain_scalar
+              (string_scalar)))
+          (block_node
+            (block_mapping
+              (block_mapping_pair
+                (flow_node
+                  (plain_scalar
+                    (string_scalar)))
+                (flow_node
+                  (flow_mapping))))))))))