Skip to content

Fix: libcib: Prevent based or cibadmin from crashing when handling an XPath query for an attribute #3980

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
wants to merge 4 commits into
base: main
Choose a base branch
from
+38 −7
Open

Fix: libcib: Prevent based or cibadmin from crashing when handling an XPath query for an attribute #3980

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a70c35
Fix: libcib: Prevent based or cibadmin from crashing when handling an…
gao-yan Oct 31, 2025
c5df440
API: libcib: Meaningful output from XPath query for an attribute
gao-yan Oct 31, 2025
dc27f40
Fix: libcib: Respect cib_xpath_address option for a query even if cib…
gao-yan Nov 3, 2025
9efad10
Fix: libcib: Handle cib_xpath_address for an XPath query for an attri…
gao-yan Nov 3, 2025
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
45 changes: 38 additions & 7 deletions lib/cib/cib_ops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,18 +766,39 @@ cib_process_xpath(const char *op, int options, const char *section,
break;

} else if (pcmk__str_eq(op, PCMK__CIB_REQUEST_QUERY, pcmk__str_none)) {
if (match->type != XML_ELEMENT_NODE
&& pcmk__is_set(options, cib_xpath_address)) {
/* @COMPAT cib_xpath_address is deprecated since 3.0.2
* For a non-element, handle cib_xpath_address with its
* corresponding element.
*/
match = pcmk__xpath_match_element(match);
if (match == NULL) {
continue;
}

} else if (match->type != XML_ELEMENT_NODE) {
xmlNode *match_element = pcmk__xpath_match_element(match);
xmlNode *brief = NULL;

if (match_element == NULL) {
continue;
}

if (options & cib_no_children) {
xmlNode *shallow = pcmk__xe_create(*answer,
(const char *) match->name);

pcmk__xe_copy_attrs(shallow, match, pcmk__xaf_none);
// Create an element with the corresponding element name
brief = pcmk__xe_create(*answer,
(const char *) match_element->name);
pcmk__xe_set(brief, PCMK_XA_ID, pcmk__xe_id(match_element));
pcmk__xml_copy(brief, match);

if (*answer == NULL) {
*answer = shallow;
*answer = brief;
}

} else if (options & cib_xpath_address) {
continue;
}

if (options & cib_xpath_address) {
// @COMPAT cib_xpath_address is deprecated since 3.0.2
char *path = NULL;
xmlNode *parent = match;
Expand Down Expand Up @@ -808,6 +829,16 @@ cib_process_xpath(const char *op, int options, const char *section,
pcmk__xe_set(parent, PCMK_XA_ID, path);
free(path);

} else if (options & cib_no_children) {
xmlNode *shallow = pcmk__xe_create(*answer,
(const char *) match->name);

pcmk__xe_copy_attrs(shallow, match, pcmk__xaf_none);

if (*answer == NULL) {
*answer = shallow;
}

} else if (*answer) {
pcmk__xml_copy(*answer, match);

Expand Down