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
|
From 9b84c007a73e8275ca45762f1bfa3ab7c3a852e2 Mon Sep 17 00:00:00 2001
From: Shaun McCance <shaunm@redhat.com>
Date: Wed, 25 Oct 2017 12:10:03 -0400
Subject: [PATCH] Be more careful about libxml2 memory management
I think this fixes https://github.com/itstool/itstool/issues/17
---
itstool.in | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/itstool.in b/itstool.in
index c1d0585..a16eba9 100755
--- a/itstool.in
+++ b/itstool.in
@@ -477,6 +477,7 @@ class Document (object):
if load_dtd:
ctxt.loadSubset(1)
if keep_entities:
+ ctxt.loadSubset(1)
ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD)
ctxt.replaceEntities(0)
else:
@@ -1043,6 +1044,7 @@ class Document (object):
if self._load_dtd:
ctxt.loadSubset(1)
if self._keep_entities:
+ ctxt.loadSubset(1)
ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD)
ctxt.replaceEntities(0)
else:
@@ -1069,7 +1071,9 @@ class Document (object):
ph_node = msg.get_placeholder(child.name).node
if self.has_child_elements(ph_node):
self.merge_translations(translations, None, ph_node, strict=strict)
- child.replaceNode(ph_node)
+ newnode = ph_node.copyNode(1)
+ newnode.setTreeDoc(self._doc)
+ child.replaceNode(newnode)
else:
repl = self.get_translated(ph_node, translations, strict=strict, lang=lang)
child.replaceNode(repl)
@@ -1084,10 +1088,15 @@ class Document (object):
(lang + ' ') if lang is not None else '',
msgstr.encode('utf-8')))
self._xml_err = ''
+ ctxt.doc().freeDoc()
return node
retnode = node.copyNode(2)
+ retnode.setTreeDoc(self._doc)
for child in xml_child_iter(trnode):
- retnode.addChild(child.copyNode(1))
+ newnode = child.copyNode(1)
+ newnode.setTreeDoc(self._doc)
+ retnode.addChild(newnode)
+
ctxt.doc().freeDoc()
return retnode
|
GitWeb
