experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

XML namespace merge bug fixed. Example: two xmlns attributes could both survive a merge whereas one should replace the other.

Browse source
This commit is contained in:
Olof hagsand 2020-02-05 12:08:20 +01:00
parent e68753655b
commit 39e7f387f8
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -31,6 +31,8 @@
### Corrected Bugs ### Corrected Bugs
* XML namespace merge bug fixed. Example: two xmlns attributes could both survive a merge whereas one should replace the other.
## 4.3.1 (2 February 2020) ## 4.3.1 (2 February 2020)
Patch release based on testing by Dave Cornejo, Netgate Patch release based on testing by Dave Cornejo, Netgate

2
lib/src/clixon_xml_map.c
View file

@ -1216,7 +1216,7 @@ check_namespaces(cxobj *x0, /* source */
} }
else{ /* No, namespace does not exist in x1 _parent_ else{ /* No, namespace does not exist in x1 _parent_
* Check if it is exists in x1 itself */ * Check if it is exists in x1 itself */
if (nscache_get_prefix(x1, namespace, &pexist) == 1){ if (xml2prefix(x1, namespace, &pexist) == 1){
/* Yes it exists, but is it equal? */ /* Yes it exists, but is it equal? */
if ((pexist == NULL && prefix0 == NULL) || if ((pexist == NULL && prefix0 == NULL) ||
(pexist && prefix0 && (pexist && prefix0 &&