Skip to content

parser yang BUGFIX comments before string concatenation #2583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michalvasko merged 1 commit into from
Sep 29, 2026
Merged

parser yang BUGFIX comments before string concatenation #2583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/parser_yang.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,20 @@ read_qstring(struct lysp_yang_ctx *ctx, enum yang_arg arg, char **word_p, char *
case '\t':
/* just skip */
break;
case '/':
if (ctx->in->current[1] == '/') {
/* one-line comment */
MOVE_INPUT(ctx, 2);
LY_CHECK_RET(skip_comment(ctx, 1));
continue;
} else if (ctx->in->current[1] == '*') {
/* block comment */
MOVE_INPUT(ctx, 2);
LY_CHECK_RET(skip_comment(ctx, 2));
continue;
}
/* not a comment after all */
/* fallthrough */
default:
/* string is finished */
goto string_end;
Expand Down
38 changes: 38 additions & 0 deletions tests/utests/schema/test_yang.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,44 @@ test_arg(void **state)
assert_int_equal(LY_EVALID, lys_parse_mem(UTEST_LYCTX, schema, LYS_IN_YANG, &mod));
CHECK_LOG_CTX("Parsing module \"test13\" failed.", NULL, 0);
CHECK_LOG_CTX("Both string parts divided by '+' must be quoted.", NULL, 5);

/* comments between the quoted strings and '+' (RFC 7950 sec. 6.1.3.) */
schema = "module test14 {\n"
" namespace urn:test14;\n"
" prefix t;\n"
" description \"hel\" /* comment */ + \'lo\';\n"
"}";
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, schema, LYS_IN_YANG, &mod));
assert_string_equal("hello", mod->dsc);

schema = "module test15 {\n"
" namespace urn:test15;\n"
" prefix t;\n"
" description \'hel\' // comment\n"
" + \"lo\";\n"
"}";
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, schema, LYS_IN_YANG, &mod));
assert_string_equal("hello", mod->dsc);

schema = "module test16 {\n"
" namespace urn:test16;\n"
" prefix t;\n"
" description \"h\"/* a */+/* b */\"el\" // c\n"
" /* d */ + // e\n"
" \'lo\' /* f */;\n"
"}";
assert_int_equal(LY_SUCCESS, lys_parse_mem(UTEST_LYCTX, schema, LYS_IN_YANG, &mod));
assert_string_equal("hello", mod->dsc);

schema = "module test17 {\n"
" namespace urn:test17;\n"
" prefix t;\n"
" description \"hel\" /* multi\n"
" line */ + lo;\n"
"}";
assert_int_equal(LY_EVALID, lys_parse_mem(UTEST_LYCTX, schema, LYS_IN_YANG, &mod));
CHECK_LOG_CTX("Parsing module \"test17\" failed.", NULL, 0);
CHECK_LOG_CTX("Both string parts divided by '+' must be quoted.", NULL, 5);
}

#define TEST_STMS_SUCCESS(CTX, MOD_NAME, STMT_TEXT) \
Expand Down
Loading