Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6043 lnet: Fix YAML FSM and other cleanup
[fs/lustre-release.git]
/
lnet
/
utils
/
cyaml
/
cyaml.c
diff --git
a/lnet/utils/cyaml/cyaml.c
b/lnet/utils/cyaml/cyaml.c
index
503c895
..
cb2bf83
100644
(file)
--- a/
lnet/utils/cyaml/cyaml.c
+++ b/
lnet/utils/cyaml/cyaml.c
@@
-448,7
+448,8
@@
static enum cYAML_handler_error yaml_stream_start(yaml_token_t *token,
static enum cYAML_handler_error yaml_stream_end(yaml_token_t *token,
struct cYAML_tree_node *tree)
{
static enum cYAML_handler_error yaml_stream_end(yaml_token_t *token,
struct cYAML_tree_node *tree)
{
- if (tree->state != TREE_STATE_TREE_STARTED)
+ if (tree->state != TREE_STATE_TREE_STARTED &&
+ tree->state != TREE_STATE_COMPLETE)
return CYAML_ERROR_UNEXPECTED_STATE;
tree->state = TREE_STATE_INITED;
return CYAML_ERROR_UNEXPECTED_STATE;
tree->state = TREE_STATE_INITED;
@@
-885,6
+886,9
@@
static void print_value(FILE *f, struct list_head *stack)
struct cYAML_print_info *cpi = NULL;
struct cYAML *node = cYAML_ll_pop(stack, &cpi);
struct cYAML_print_info *cpi = NULL;
struct cYAML *node = cYAML_ll_pop(stack, &cpi);
+ if (node == NULL)
+ return;
+
switch (node->cy_type) {
case CYAML_TYPE_FALSE:
case CYAML_TYPE_TRUE:
switch (node->cy_type) {
case CYAML_TYPE_FALSE:
case CYAML_TYPE_TRUE: