aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/util/profile/final6.ini7
-rw-r--r--src/util/profile/prof_parse.c14
2 files changed, 16 insertions, 5 deletions
diff --git a/src/util/profile/final6.ini b/src/util/profile/final6.ini
index c1e44b7..0035c47 100644
--- a/src/util/profile/final6.ini
+++ b/src/util/profile/final6.ini
@@ -25,6 +25,13 @@
bb = {
bba = 2
}
+ # Regression test for a bug where each subsection within a
+ # discarded section caused the parser to ascend into the
+ # parent node without descending into a child node first.
+ bb = {
+ }
+ bb = {
+ }
[c]
ca* = {
diff --git a/src/util/profile/prof_parse.c b/src/util/profile/prof_parse.c
index c581fb7..2e329de 100644
--- a/src/util/profile/prof_parse.c
+++ b/src/util/profile/prof_parse.c
@@ -124,18 +124,22 @@ static errcode_t parse_std_line(char *line, struct parse_state *state)
return 0;
}
if (ch == '}') {
- if (state->group_level == 0)
+ if (state->group_level < 2)
return PROF_EXTRA_CBRACE;
if (*(cp+1) == '*')
profile_make_node_final(state->current_section);
- retval = profile_get_node_parent(state->current_section,
- &state->current_section);
- if (retval)
- return retval;
state->group_level--;
/* Check if we are done discarding values from a subsection. */
if (state->group_level < state->discard)
state->discard = 0;
+ /* Ascend to the current node's parent, unless the subsection we ended
+ * was discarded (in which case we never descended). */
+ if (!state->discard) {
+ retval = profile_get_node_parent(state->current_section,
+ &state->current_section);
+ if (retval)
+ return retval;
+ }
return 0;
}
/*