Use SAX2 parser for GML/KML #758
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rouault
approved these changes
Feb 7, 2024
Comment on lines
+129
to
+130
| char *colon_pos; | ||
| char *node_name; |
There was a problem hiding this comment.
Suggested change
| char *colon_pos; | |
| char *node_name; | |
| const char *colon_pos; | |
| const char *node_name; |
| /* If there's a colon in the element name, */ | ||
| /* move past it before checking for equality with */ | ||
| /* the element name we are looking for */ | ||
| node_name = (char*)xn->name; |
There was a problem hiding this comment.
Suggested change
| node_name = (char*)xn->name; | |
| node_name = (const char*)xn->name; |
Comment on lines
+70
to
+71
| char *colon_pos; | ||
| char *node_name; |
There was a problem hiding this comment.
Suggested change
| char *colon_pos; | |
| char *node_name; | |
| const char *colon_pos; | |
| const char *node_name; |
| /* If there's a colon in the element name, */ | ||
| /* move past it before checking for equality with */ | ||
| /* the element name we are looking for */ | ||
| node_name = (char*)xn->name; |
There was a problem hiding this comment.
Suggested change
| node_name = (char*)xn->name; | |
| node_name = (const char*)xn->name; |
| @@ -88,7 +110,8 @@ Datum geom_from_kml(PG_FUNCTION_ARGS) | |||
|
|
|||
| /* Begin to Parse XML doc */ | |||
| xmlInitParser(); | |||
| xmldoc = xmlReadMemory(xml, xml_size, NULL, NULL, XML_PARSE_SAX1); | |||
| xmldoc = xmlReadMemory(xml, xml_size, NULL, NULL, 0); | |||
| // xmldoc = xmlReadMemory(xml, xml_size, NULL, NULL, XML_PARSE_SAX1); | |||
There was a problem hiding this comment.
Suggested change
| // xmldoc = xmlReadMemory(xml, xml_size, NULL, NULL, XML_PARSE_SAX1); |
| static inline bool | ||
| is_xml_element(xmlNodePtr xn, const char *xml_name) | ||
| { | ||
| char *colon_pos, *node_name; |
There was a problem hiding this comment.
Suggested change
| char *colon_pos, *node_name; | |
| const char *colon_pos; | |
| const char *node_name; |
| /* If there's a colon in the element name, */ | ||
| /* move past it before checking for equality with */ | ||
| /* the element name we are looking for */ | ||
| node_name = (char*)xn->name; |
There was a problem hiding this comment.
Suggested change
| node_name = (char*)xn->name; | |
| node_name = (const char*)xn->name; |
There was a problem hiding this comment.
Thanks for the feedback! Applied in 7038255 going forwards.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This works around a change in the SAX1 parser behaviour that came about recently in RHEL builds due to a security fix that has been widely applied.
https://gitlab.gnome.org/GNOME/libxml2/-/issues/535
https://access.redhat.com/errata/RHSA-2024:0119