Skip to content

server: anchor dsml_attr attribute match to a name boundary #757

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

Open
Flor1an-B wants to merge 1 commit into
base: main
Choose a base branch
from
Open

server: anchor dsml_attr attribute match to a name boundary #757

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
51 changes: 41 additions & 10 deletions ds4_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4680,16 +4680,22 @@ static char *dsml_unescape_text(const char *s) {

static char *dsml_attr(const char *tag, const char *name) {
char pat[64];
snprintf(pat, sizeof(pat), "%s=\"", name);
const char *p = strstr(tag, pat);
if (!p) return NULL;
p += strlen(pat);
const char *q = strchr(p, '"');
if (!q) return NULL;
char *raw = xstrndup(p, (size_t)(q - p));
char *decoded = dsml_unescape_text(raw);
free(raw);
return decoded;
const int patlen = snprintf(pat, sizeof(pat), "%s=\"", name);
if (patlen < 0 || (size_t)patlen >= sizeof(pat)) return NULL;
/* Anchor the match to an attribute boundary: `name="` must start right after
* `<`, the tag name, or whitespace, so it is not matched inside a longer
* attribute like `fullname="..."` earlier in the same tag. */
for (const char *p = strstr(tag, pat); p; p = strstr(p + 1, pat)) {
if (p != tag && !isspace((unsigned char)p[-1]) && p[-1] != '<') continue;
const char *v = p + patlen;
const char *q = strchr(v, '"');
if (!q) return NULL;
char *raw = xstrndup(v, (size_t)(q - v));
char *decoded = dsml_unescape_text(raw);
free(raw);
return decoded;
}
return NULL;
}

static void tool_call_json_args_add(buf *args, const char *name, const char *value, const char *is_string) {
Expand Down Expand Up @@ -15044,6 +15050,30 @@ static void test_parse_glm_tool_call_message(void) {
tool_calls_free(&calls);
}

static void test_dsml_attr_anchors_attribute_name(void) {
/* A preceding attribute whose name ends in the sought name (here `fullname`
* vs `name`) must not be matched: the value belongs to the real `name`. */
char *v = dsml_attr("<invoke fullname=\"wrong\" name=\"right\">", "name");
TEST_ASSERT(v && !strcmp(v, "right"));
free(v);

/* The ordinary single-attribute case still resolves. */
v = dsml_attr("<invoke name=\"tool\">", "name");
TEST_ASSERT(v && !strcmp(v, "tool"));
free(v);

/* A parameter named with a `string` suffix must not shadow the real
* `string=` type attribute that follows it. */
v = dsml_attr("<parameter name=\"mystring\" string=\"false\">", "string");
TEST_ASSERT(v && !strcmp(v, "false"));
free(v);

/* A genuinely absent attribute stays absent. */
v = dsml_attr("<invoke fullname=\"x\">", "name");
TEST_ASSERT(v == NULL);
free(v);
}

static void test_dsml_parser_recovers_loose_nested_parameters(void) {
const char *generated =
"review done\n\n"
Expand Down Expand Up @@ -17802,6 +17832,7 @@ static void ds4_server_unit_tests_run(void) {
test_responses_input_tool_search_output_rejects_bad_tools();
test_responses_input_function_call_namespace_round_trips_to_dsml();
test_responses_output_sends_tool_search_call_item();
test_dsml_attr_anchors_attribute_name();
test_dsml_tool_args_preserve_call_order();
test_openai_tool_args_preserve_call_order();
test_anthropic_thinking_and_tool_args_preserve_call_order();
Expand Down