Skip to content

Commit 981d225

Browse files
authored
Merge pull request #3411 from airween/v2/xmlparseempty
fix: remove unwanted '\0' string terminator from argument's value
2 parents 5615add + e12c0ef commit 981d225

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

apache2/msc_xml.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ static void msc_xml_on_end_elementns(
7676
msr_log(msr, 4, "Skipping request argument, over limit (XML): name \"%s\", value \"%s\"",
7777
log_escape_ex(msr->mp, xml_parser_state->currpath, xml_parser_state->currpathbufflen),
7878
log_escape_ex(msr->mp,
79-
(xml_parser_state->currval == NULL ? apr_pstrndup(msr->mp, "", 1) : xml_parser_state->currval),
80-
(xml_parser_state->currvalbufflen == 0 ? 1 : xml_parser_state->currvalbufflen)
79+
(xml_parser_state->currval == NULL ? apr_pstrndup(msr->mp, "", 0) : xml_parser_state->currval),
80+
xml_parser_state->currvalbufflen
8181
)
8282
);
8383
}
@@ -91,8 +91,8 @@ static void msc_xml_on_end_elementns(
9191

9292
arg->name = xml_parser_state->currpath;
9393
arg->name_len = xml_parser_state->currpathbufflen;
94-
arg->value = (xml_parser_state->currval == NULL) ? apr_pstrndup(msr->mp, "", 1) : xml_parser_state->currval;
95-
arg->value_len = (xml_parser_state->currvalbufflen == 0) ? 1 : xml_parser_state->currvalbufflen;
94+
arg->value = (xml_parser_state->currval == NULL) ? apr_pstrndup(msr->mp, "", 0) : xml_parser_state->currval;
95+
arg->value_len = xml_parser_state->currvalbufflen;
9696
arg->value_origin_len = arg->value_len;
9797
arg->origin = "XML";
9898

0 commit comments

Comments
 (0)