Skip to content

Fix xp_ctx heap overflow: struct layout depended on XPATH_CURRENT_OPTIMIZE #701

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
khromenokroman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix xp_ctx heap overflow: struct layout depended on XPATH_CURRENT_OPTIMIZE #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cb0ef7
fix: make xp_ctx and xpath_tree layout independent of XPATH_CURRENT_O…
khromenokroman Oct 7, 2026
8edd731
fix: include clixon_config.h in clixon_xpath_ctx.c
khromenokroman Oct 7, 2026
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
4 changes: 2 additions & 2 deletions lib/clixon/clixon_xpath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ struct xpath_tree{
struct xpath_tree *xs_c0; /* child 0 */
struct xpath_tree *xs_c1; /* child 1 */
int xs_match; /* meta: match this node */
#ifdef XPATH_CURRENT_OPTIMIZE
/* Unconditional (not only XPATH_CURRENT_OPTIMIZE): struct layout must not depend on
* compile options, see https://github.com/clicon/clixon/issues/698 */
void *xs_cached_result; /* xp_ctx *: cached evaluation result */
void *xs_cached_initial; /* cxobj *: xc_initial for which cache is valid */
#endif
};
typedef struct xpath_tree xpath_tree;

Expand Down
4 changes: 2 additions & 2 deletions lib/clixon/clixon_xpath_ctx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ struct xp_ctx{
cxobj *xc_initial; /* RFC 7960 10.1.1 extension: for current() */
int xc_descendant; /* // */
/* NYI: a set of variable bindings, set of namespace declarations */
#ifdef XPATH_CURRENT_OPTIMIZE
/* Unconditional (not only XPATH_CURRENT_OPTIMIZE): struct layout must not depend on
* compile options, see https://github.com/clicon/clixon/issues/698 */
int xc_invariant; /* result depends only on xc_initial (current()) */
#endif
};
typedef struct xp_ctx xp_ctx;

Expand Down
4 changes: 4 additions & 0 deletions lib/src/clixon_xpath_ctx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
* Clixon XML XPath 1.0 according to https://www.w3.org/TR/xpath-10
* This file defines XPath contexts used in traversing the XPath parse tree.
*/
#ifdef HAVE_CONFIG_H
#include "clixon_config.h" /* generated by config & autoconf */
#endif

#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Expand Down
Loading