diff --git a/cmake/BuildLibYAML.cmake b/cmake/BuildLibYAML.cmake
index 01eb6116d74420ef98463cf494eb362fbb6a9e33..bca7910d7a29ac95ff7dea2b44219ec0ccac80b7 100644
--- a/cmake/BuildLibYAML.cmake
+++ b/cmake/BuildLibYAML.cmake
@@ -13,7 +13,7 @@ macro(libyaml_build)
${PROJECT_SOURCE_DIR}/third_party/lua-yaml/b64.c)
set_source_files_properties(${yaml_src} PROPERTIES COMPILE_FLAGS
- "-std=c99")
+ "-std=c99 -I\"${PROJECT_SOURCE_DIR}/third_party/lua-yaml\"")
set_source_files_properties(
${PROJECT_SOURCE_DIR}/third_party/lua-yaml/lyaml.cc
PROPERTIES COMPILE_FLAGS
diff --git a/test/app/yaml.test.lua b/test/app/yaml.test.lua
index 54ef89d6a92f2ba46da0e5d7fabe9ddff040fe9d..d339a41f68d46198b341d13662f3850318fb4168 100755
--- a/test/app/yaml.test.lua
+++ b/test/app/yaml.test.lua
@@ -6,11 +6,11 @@ local tap = require('tap')
local common = require('serializer_test')
local function is_map(s)
- return s:match("---\n%w+%:") or s:match("---\n{%w+%:")
+ return s:match("---[\n ]%w+%:") or s:match("---[\n ]{%w+%:")
end
local function is_array(s)
- return s:match("---\n%[") or s:match("---\n- ");
+ return s:match("---[\n ]%[") or s:match("---[\n ]- ");
end
local function test_compact(test, s)
@@ -25,16 +25,16 @@ local function test_compact(test, s)
"---\n- 10\n- 15\n- 20\n...\n", "block array")
test:is(ss.encode(setmetatable({10, 15, 20}, { __serialize="sequence"})),
"---\n- 10\n- 15\n- 20\n...\n", "block array")
- test:is(ss.encode(setmetatable({10, 15, 20}, { __serialize="seq"})),
- "---\n[10, 15, 20]\n...\n", "flow array")
+ test:is(ss.encode({setmetatable({10, 15, 20}, { __serialize="seq"})}),
+ "---\n- [10, 15, 20]\n...\n", "flow array")
test:is(getmetatable(ss.decode(ss.encode({10, 15, 20}))).__serialize, "seq",
"decoded __serialize is seq")
test:is(ss.encode({k = 'v'}), "---\nk: v\n...\n", "block map")
test:is(ss.encode(setmetatable({k = 'v'}, { __serialize="mapping"})),
"---\nk: v\n...\n", "block map")
- test:is(ss.encode(setmetatable({k = 'v'}, { __serialize="map"})),
- "---\n{k: v}\n...\n", "flow map")
+ test:is(ss.encode({setmetatable({k = 'v'}, { __serialize="map"})}),
+ "---\n- {k: v}\n...\n", "flow map")
test:is(getmetatable(ss.decode(ss.encode({k = 'v'}))).__serialize, "map",
"decoded __serialize is map")
@@ -43,11 +43,11 @@ end
local function test_output(test, s)
test:plan(6)
- test:is(s.encode(true), '---\ntrue\n...\n', "encode for true")
+ test:is(s.encode({true}), '---\n- true\n...\n', "encode for true")
test:is(s.decode("---\nyes\n..."), true, "decode for 'yes'")
- test:is(s.encode(false), '---\nfalse\n...\n', "encode for false")
+ test:is(s.encode({false}), '---\n- false\n...\n', "encode for false")
test:is(s.decode("---\nno\n..."), false, "decode for 'no'")
- test:is(s.encode(nil), '---\nnull\n...\n', "encode for nil")
+ test:is(s.encode({s.NULL}), '---\n- null\n...\n', "encode for nil")
test:is(s.decode("---\n~\n..."), s.NULL, "decode for ~")
end
diff --git a/third_party/lua-yaml/emitter.c b/third_party/lua-yaml/emitter.c
index ce257d1847b4fd987990c8aa831fc5fdd95a41c3..c4b56a26bb56e33cd3b2a54eee040211c39cae96 100644
--- a/third_party/lua-yaml/emitter.c
+++ b/third_party/lua-yaml/emitter.c
@@ -236,10 +236,6 @@ static int
yaml_emitter_write_tag_content(yaml_emitter_t *emitter,
yaml_char_t *value, size_t length, int need_whitespace);
-static int
-yaml_emitter_write_verbatim_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int allow_breaks);
-
static int
yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
yaml_char_t *value, size_t length, int allow_breaks);
@@ -640,8 +636,10 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
return 0;
if (!yaml_emitter_write_indicator(emitter, "---", 1, 0, 0))
return 0;
- if (!yaml_emitter_write_indent(emitter))
- return 0;
+ if (emitter->canonical) {
+ if (!yaml_emitter_write_indent(emitter))
+ return 0;
+ }
}
emitter->state = YAML_EMIT_DOCUMENT_CONTENT_STATE;
@@ -1156,7 +1154,7 @@ yaml_emitter_check_simple_key(yaml_emitter_t *emitter)
break;
case YAML_MAPPING_START_EVENT:
- if (!yaml_emitter_check_empty_sequence(emitter))
+ if (!yaml_emitter_check_empty_mapping(emitter))
return 0;
length += emitter->anchor_data.anchor_length
+ emitter->tag_data.handle_length
@@ -1181,9 +1179,6 @@ static int
yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event)
{
yaml_scalar_style_t style = event->data.scalar.style;
- if (style == YAML_VERBATIM_SCALAR_STYLE)
- goto done;
-
int no_tag = (!emitter->tag_data.handle && !emitter->tag_data.suffix);
if (no_tag && !event->data.scalar.plain_implicit
@@ -1233,8 +1228,8 @@ yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event)
emitter->tag_data.handle_length = 1;
}
-done:
emitter->scalar_data.style = style;
+
return 1;
}
@@ -1300,11 +1295,6 @@ yaml_emitter_process_scalar(yaml_emitter_t *emitter)
{
switch (emitter->scalar_data.style)
{
- case YAML_VERBATIM_SCALAR_STYLE:
- return yaml_emitter_write_verbatim_scalar(emitter,
- emitter->scalar_data.value, emitter->scalar_data.length,
- !emitter->simple_key_context);
-
case YAML_PLAIN_SCALAR_STYLE:
return yaml_emitter_write_plain_scalar(emitter,
emitter->scalar_data.value, emitter->scalar_data.length,
@@ -1481,20 +1471,6 @@ yaml_emitter_analyze_tag(yaml_emitter_t *emitter,
return 1;
}
-static int
-yaml_emitter_analyze_scalar_verbatim(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length)
-{
- emitter->scalar_data.value = value;
- emitter->scalar_data.length = length;
- emitter->scalar_data.multiline = 0;
- emitter->scalar_data.flow_plain_allowed = 0;
- emitter->scalar_data.block_plain_allowed = 1;
- emitter->scalar_data.single_quoted_allowed = 1;
- emitter->scalar_data.block_allowed = 0;
- return 1;
-}
-
/*
* Check if a scalar is valid.
*/
@@ -1527,12 +1503,6 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
emitter->scalar_data.value = value;
emitter->scalar_data.length = length;
- emitter->scalar_data.multiline = 0;
- emitter->scalar_data.flow_plain_allowed = 0;
- emitter->scalar_data.block_plain_allowed = 1;
- emitter->scalar_data.single_quoted_allowed = 1;
- emitter->scalar_data.block_allowed = 0;
-
if (string.start == string.end)
{
emitter->scalar_data.multiline = 0;
@@ -1738,10 +1708,6 @@ yaml_emitter_analyze_event(yaml_emitter_t *emitter,
if (!yaml_emitter_analyze_tag(emitter, event->data.scalar.tag))
return 0;
}
- if (event->data.scalar.style == YAML_VERBATIM_SCALAR_STYLE) {
- yaml_emitter_analyze_scalar_verbatim(emitter,
- event->data.scalar.value, event->data.scalar.length);
- } else
if (!yaml_emitter_analyze_scalar(emitter,
event->data.scalar.value, event->data.scalar.length))
return 0;
@@ -1928,19 +1894,6 @@ yaml_emitter_write_tag_content(yaml_emitter_t *emitter,
return 1;
}
-static int
-yaml_emitter_write_verbatim_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int allow_breaks)
-{
- (void)allow_breaks;
- yaml_string_t string;
- STRING_ASSIGN(string, value, length);
- while (string.pointer != string.end) {
- if (!WRITE(emitter, string)) return 0;
- }
- return 1;
-}
-
static int
yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
yaml_char_t *value, size_t length, int allow_breaks)
diff --git a/third_party/lua-yaml/loader.c b/third_party/lua-yaml/loader.c
index 9d3d912663c3282e5c731ebf9e5587a1111ec79b..871149ab91f0cef5329bb5421f1dcb71cfcbf64f 100644
--- a/third_party/lua-yaml/loader.c
+++ b/third_party/lua-yaml/loader.c
@@ -286,6 +286,8 @@ yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
int index;
yaml_char_t *tag = first_event->data.scalar.tag;
+ if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
+
if (!tag || strcmp((char *)tag, "!") == 0) {
yaml_free(tag);
tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_SCALAR_TAG);
@@ -329,6 +331,8 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
int index, item_index;
yaml_char_t *tag = first_event->data.sequence_start.tag;
+ if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
+
if (!tag || strcmp((char *)tag, "!") == 0) {
yaml_free(tag);
tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG);
@@ -351,6 +355,9 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
if (!yaml_parser_parse(parser, &event)) return 0;
while (event.type != YAML_SEQUENCE_END_EVENT) {
+ if (!STACK_LIMIT(parser,
+ parser->document->nodes.start[index-1].data.sequence.items,
+ INT_MAX-1)) return 0;
item_index = yaml_parser_load_node(parser, &event);
if (!item_index) return 0;
if (!PUSH(parser,
@@ -387,6 +394,8 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
yaml_node_pair_t pair;
yaml_char_t *tag = first_event->data.mapping_start.tag;
+ if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
+
if (!tag || strcmp((char *)tag, "!") == 0) {
yaml_free(tag);
tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_MAPPING_TAG);
@@ -409,6 +418,9 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
if (!yaml_parser_parse(parser, &event)) return 0;
while (event.type != YAML_MAPPING_END_EVENT) {
+ if (!STACK_LIMIT(parser,
+ parser->document->nodes.start[index-1].data.mapping.pairs,
+ INT_MAX-1)) return 0;
pair.key = yaml_parser_load_node(parser, &event);
if (!pair.key) return 0;
if (!yaml_parser_parse(parser, &event)) return 0;
diff --git a/third_party/lua-yaml/reader.c b/third_party/lua-yaml/reader.c
index 829e32da55c0bee1baf572d72b574076a7ca52eb..d47921ce2b216f031d9ec93f54da6628bdc448ec 100644
--- a/third_party/lua-yaml/reader.c
+++ b/third_party/lua-yaml/reader.c
@@ -460,6 +460,10 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)
}
+ if (parser->offset >= PTRDIFF_MAX)
+ return yaml_parser_set_reader_error(parser, "input is too long",
+ PTRDIFF_MAX, -1);
+
return 1;
}
diff --git a/third_party/lua-yaml/scanner.c b/third_party/lua-yaml/scanner.c
index 86e2050165a0f2da6e4e2342cc6d630a7f614b8d..88d4fa5df24cb68f752135978f5f17e7e68810a1 100644
--- a/third_party/lua-yaml/scanner.c
+++ b/third_party/lua-yaml/scanner.c
@@ -615,11 +615,11 @@ yaml_parser_decrease_flow_level(yaml_parser_t *parser);
*/
static int
-yaml_parser_roll_indent(yaml_parser_t *parser, int column,
- int number, yaml_token_type_t type, yaml_mark_t mark);
+yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
+ ptrdiff_t number, yaml_token_type_t type, yaml_mark_t mark);
static int
-yaml_parser_unroll_indent(yaml_parser_t *parser, int column);
+yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column);
/*
* Token fetchers.
@@ -1103,7 +1103,7 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
*/
int required = (!parser->flow_level
- && parser->indent == (int)parser->mark.column);
+ && parser->indent == (ptrdiff_t)parser->mark.column);
/*
* A simple key is required only when it is the first token in the current
@@ -1122,7 +1122,7 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
simple_key.possible = 1;
simple_key.required = required;
simple_key.token_number =
- parser->tokens_parsed + parser->tokens.tail - parser->tokens.head;
+ parser->tokens_parsed + (parser->tokens.tail - parser->tokens.head);
simple_key.mark = parser->mark;
if (!yaml_parser_remove_simple_key(parser)) return 0;
@@ -1176,6 +1176,11 @@ yaml_parser_increase_flow_level(yaml_parser_t *parser)
/* Increase the flow level. */
+ if (parser->flow_level == INT_MAX) {
+ parser->error = YAML_MEMORY_ERROR;
+ return 0;
+ }
+
parser->flow_level++;
return 1;
@@ -1206,8 +1211,8 @@ yaml_parser_decrease_flow_level(yaml_parser_t *parser)
*/
static int
-yaml_parser_roll_indent(yaml_parser_t *parser, int column,
- int number, yaml_token_type_t type, yaml_mark_t mark)
+yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
+ ptrdiff_t number, yaml_token_type_t type, yaml_mark_t mark)
{
yaml_token_t token;
@@ -1226,6 +1231,11 @@ yaml_parser_roll_indent(yaml_parser_t *parser, int column,
if (!PUSH(parser, parser->indents, parser->indent))
return 0;
+ if (column > INT_MAX) {
+ parser->error = YAML_MEMORY_ERROR;
+ return 0;
+ }
+
parser->indent = column;
/* Create a token and insert it into the queue. */
@@ -1254,7 +1264,7 @@ yaml_parser_roll_indent(yaml_parser_t *parser, int column,
static int
-yaml_parser_unroll_indent(yaml_parser_t *parser, int column)
+yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column)
{
yaml_token_t token;
@@ -2574,7 +2584,7 @@ yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
/* Resize the string to include the head. */
- while (string.end - string.start <= (int)length) {
+ while ((size_t)(string.end - string.start) <= length) {
if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
parser->error = YAML_MEMORY_ERROR;
goto error;
@@ -2619,6 +2629,9 @@ yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
/* Check if it is a URI-escape sequence. */
if (CHECK(parser->buffer, '%')) {
+ if (!STRING_EXTEND(parser, string))
+ goto error;
+
if (!yaml_parser_scan_uri_escapes(parser,
directive, start_mark, &string)) goto error;
}
diff --git a/third_party/lua-yaml/yaml_private.h b/third_party/lua-yaml/yaml_private.h
index 08bca967bd2ed218cf69b9cd1dea2950fd3cb191..f4e790423ec03b4c23118907448ebbc16c29dfcd 100644
--- a/third_party/lua-yaml/yaml_private.h
+++ b/third_party/lua-yaml/yaml_private.h
@@ -1,13 +1,27 @@
-
#define YAML_VERSION_MAJOR 0
#define YAML_VERSION_MINOR 1
-#define YAML_VERSION_PATCH 3
-#define YAML_VERSION_STRING "0.1.3"
+#define YAML_VERSION_PATCH 6
+#define YAML_VERSION_STRING "0.1.6"
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include "yaml.h"
+#include <yaml.h>
#include <assert.h>
#include <limits.h>
+#include <stddef.h>
+
+#ifndef _MSC_VER
+#include <stdint.h>
+#else
+#ifdef _WIN64
+#define PTRDIFF_MAX _I64_MAX
+#else
+#define PTRDIFF_MAX INT_MAX
+#endif
+#endif
/*
* Memory management.
@@ -133,9 +147,12 @@ yaml_string_join(
(string).start = (string).pointer = (string).end = 0)
#define STRING_EXTEND(context,string) \
- (((string).pointer+5 < (string).end) \
+ ((((string).pointer+5 < (string).end) \
|| yaml_string_extend(&(string).start, \
- &(string).pointer, &(string).end))
+ &(string).pointer, &(string).end)) ? \
+ 1 : \
+ ((context)->error = YAML_MEMORY_ERROR, \
+ 0))
#define CLEAR(context,string) \
((string).pointer = (string).start, \
@@ -229,9 +246,9 @@ yaml_string_join(
(string).pointer[offset] <= (yaml_char_t) 'f') ? \
((string).pointer[offset] - (yaml_char_t) 'a' + 10) : \
((string).pointer[offset] - (yaml_char_t) '0'))
-
+
#define AS_HEX(string) AS_HEX_AT((string),0)
-
+
/*
* Check if the character is ASCII.
*/
@@ -422,6 +439,12 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end);
#define STACK_EMPTY(context,stack) \
((stack).start == (stack).top)
+#define STACK_LIMIT(context,stack,size) \
+ ((stack).top - (stack).start < (size) ? \
+ 1 : \
+ ((context)->error = YAML_MEMORY_ERROR, \
+ 0))
+
#define PUSH(context,stack,value) \
(((stack).top != (stack).end \
|| yaml_stack_extend((void **)&(stack).start, \