1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From c45ed81aeb50a7fb6799a166270d6ccc9ffa63b2 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Thu, 19 Sep 2024 21:49:46 +0200
Subject: [PATCH] variables: Fix non-deterministic generated IDs
Evaluate global variables in deterministic order. Otherwise, generated
IDs could be non-deterministic if generate-id() is called.
Fixes #123.
Origin: https://gitlab.gnome.org/GNOME/libxslt/-/commit/c45ed81aeb50a7fb6799a166270d6ccc9ffa63b2
Bug: https://gitlab.gnome.org/GNOME/libxslt/-/issues/123
---
libxslt/variables.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/libxslt/variables.c b/libxslt/variables.c
index ec3929c..d92ae71 100644
--- a/libxslt/variables.c
+++ b/libxslt/variables.c
@@ -1258,13 +1258,6 @@ error:
return(result);
}
-static void
-xsltEvalGlobalVariableWrapper(void *payload, void *data,
- const xmlChar *name ATTRIBUTE_UNUSED) {
- xsltEvalGlobalVariable((xsltStackElemPtr) payload,
- (xsltTransformContextPtr) data);
-}
-
/**
* xsltEvalGlobalVariables:
* @ctxt: the XSLT transformation context
@@ -1277,6 +1270,7 @@ xsltEvalGlobalVariableWrapper(void *payload, void *data,
int
xsltEvalGlobalVariables(xsltTransformContextPtr ctxt) {
xsltStackElemPtr elem;
+ xsltStackElemPtr head = NULL;
xsltStylesheetPtr style;
if ((ctxt == NULL) || (ctxt->document == NULL))
@@ -1320,6 +1314,8 @@ xsltEvalGlobalVariables(xsltTransformContextPtr ctxt) {
xsltFreeStackElem(def);
return(-1);
}
+ def->next = head;
+ head = def;
} else if ((elem->comp != NULL) &&
(elem->comp->type == XSLT_FUNC_VARIABLE)) {
/*
@@ -1342,9 +1338,19 @@ xsltEvalGlobalVariables(xsltTransformContextPtr ctxt) {
}
/*
- * This part does the actual evaluation
+ * This part does the actual evaluation. Note that scanning the hash
+ * table would result in a non-deterministic order, leading to
+ * non-deterministic generated IDs.
*/
- xmlHashScan(ctxt->globalVars, xsltEvalGlobalVariableWrapper, ctxt);
+ elem = head;
+ while (elem != NULL) {
+ xsltStackElemPtr next;
+
+ xsltEvalGlobalVariable(elem, ctxt);
+ next = elem->next;
+ elem->next = NULL;
+ elem = next;
+ }
return(0);
}
|
