yeptris 0.6.32.1-arm-linux-eabihf → 0.6.33.1-arm-linux-eabihf

data/vendor/libyeptris/src/yeptris/emit/emit.c

@@ -51,6 +51,9 @@ YEPTRIS_API size_t yeptris_serialize_into_ex(YeptrisDocument handle,
     em.w.p = NULL;
     em.w.last = 0;
     em.w.force_flow = 0;
+    em.w.in_flow = 0;
+    em.w.flow_item = 0;
+    em.w.unserializable = 0;
     em.w.canonical = opts_canonical(opts);
     em.w.explicit_doc_start = opts_doc_marker(opts);
     em.w.json = 0;
@@ -116,6 +119,9 @@ YEPTRIS_API char* yeptris_serialize_ex(YeptrisDocument handle, const yeptris_emi
     em.w.p = NULL;
     em.w.last = 0;
     em.w.force_flow = 0;
+    em.w.in_flow = 0;
+    em.w.flow_item = 0;
+    em.w.unserializable = 0;
     em.w.canonical = opts_canonical(opts);
     em.w.explicit_doc_start = opts_doc_marker(opts);
     em.w.json = 0;
@@ -160,7 +166,7 @@ YEPTRIS_API char* yeptris_serialize_ex(YeptrisDocument handle, const yeptris_emi
      * any growth; every post-run touch goes through the writer's
      * pointer (the first round's abort was exactly this aliasing) */
     out = em.w.p;
-    if (em.w.oom) {
+    if (em.w.oom || em.w.unserializable) {
         free(out);
         if (em.canon_names.sys != NULL) {
             yep_nametab_free(&em.canon_names);
@@ -200,6 +206,9 @@ YEPTRIS_API char* yeptris_serialize_json(YeptrisDocument handle, size_t* len) {
     em.w.p = NULL;
     em.w.last = 0;
     em.w.force_flow = 0;
+    em.w.in_flow = 0;
+    em.w.flow_item = 0;
+    em.w.unserializable = 0;
     em.w.canonical = 0;
     em.w.explicit_doc_start = 0; /* JSON output carries no --- */
     em.w.json = 1;
@@ -258,6 +267,9 @@ YEPTRIS_API char* yeptris_serialize_json_ex(YeptrisDocument handle, size_t* len,
     em.w.p = NULL;
     em.w.last = 0;
     em.w.force_flow = 0;
+    em.w.in_flow = 0;
+    em.w.flow_item = 0;
+    em.w.unserializable = 0;
     em.w.canonical = 0;
     em.w.explicit_doc_start = 0; /* JSON output carries no --- */
     em.w.json = 1;
@@ -310,6 +322,9 @@ char* yep_serialize_json_compact(const yeptris_document* doc, size_t* len) {
     em.w.p = NULL;
     em.w.last = 0;
     em.w.force_flow = 0;
+    em.w.in_flow = 0;
+    em.w.flow_item = 0;
+    em.w.unserializable = 0;
     em.w.canonical = 0;
     em.w.explicit_doc_start = 0; /* JSON output carries no --- */
     em.w.json = 1;
@@ -362,6 +377,9 @@ char* yep_serialize_json_pretty(const yeptris_document* doc, size_t* len) {
     em.w.p = NULL;
     em.w.last = 0;
     em.w.force_flow = 0;
+    em.w.in_flow = 0;
+    em.w.flow_item = 0;
+    em.w.unserializable = 0;
     em.w.canonical = 0;
     em.w.explicit_doc_start = 0; /* JSON output carries no --- */
     em.w.json = 1;
@@ -430,6 +448,9 @@ YEPTRIS_API size_t yeptris_serialize_stream(YeptrisDocument handle,
     em.w.p = NULL;
     em.w.last = 0;
     em.w.force_flow = 0;
+    em.w.in_flow = 0;
+    em.w.flow_item = 0;
+    em.w.unserializable = 0;
     em.w.canonical = opts_canonical(opts);
     em.w.explicit_doc_start = opts_doc_marker(opts);
     em.w.json = 0;

data/vendor/libyeptris/src/yeptris/emit/style.c

@@ -19,6 +19,13 @@ int yep_style_plain_safe(const char* p, uint32_t len) {
     if (is_blank(p[0]) || is_blank(p[len - 1])) {
         return 0;
     }
+    if (len >= 3 && (unsigned char)p[0] == 0xef && (unsigned char)p[1] == 0xbb &&
+        (unsigned char)p[2] == 0xbf) {
+        /* a LEADING U+FEFF re-parses as a document BOM and vanishes —
+         * the emitted form must carry its escape ("\uFEFF", the
+         * nightly's run 38258674337); mid-token BOMs ride plain */
+        return 0;
+    }
     switch (p[0]) {
     case ':':
         /* libyaml (Psych symbol dumps ":name"): a leading colon only
@@ -119,7 +126,12 @@ int yep_style_plain_safe(const char* p, uint32_t len) {
         }
     }
     /* document markers */
-    if ((len == 3 && (memcmp(p, "---", 3) == 0 || memcmp(p, "...", 3) == 0))) {
+    if (len >= 3 && (memcmp(p, "---", 3) == 0 || memcmp(p, "...", 3) == 0) &&
+        (len == 3 || p[3] == ' ' || p[3] == '\t' || p[3] == '\n' || p[3] == '\r')) {
+        /* a PREFIX marker is worse than the bare one: emitted plain at
+         * line start, "--- ..." re-reads as a document marker (the
+         * nightly's "--- --- >" folded-plain crasher) — libyaml quotes
+         * both */
         return 0;
     }
     return 1;