Attachment 863732 Details for Bug 1065738 – direct.patch

[patch] direct.patch

direct.patch (text/plain), 2.24 KB, created by ayanamist on 2014-02-16 13:37:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ayanamist

Created: 2014-02-16 13:37:19 UTC

Size: 2.24 KB

patch

obsolete

>diff --git a/src/firewall/core/io/direct.py b/src/firewall/core/io/direct.py
>index 7d15987..ca8617a 100644
>--- a/src/firewall/core/io/direct.py
>+++ b/src/firewall/core/io/direct.py
>@@ -36,6 +36,7 @@ class direct_ContentHandler(IO_Object_ContentHandler):
>         self.direct = False
> 
>     def startElement(self, name, attrs):
>+        IO_Object_ContentHandler.startElement(self, name)
>         self.item.parser_check_element_attrs(name, attrs)
> 
>         if name == "direct":
>@@ -348,7 +349,7 @@ class Direct(IO_Object):
>                 handler.startElement("rule", { "ipv": ipv, "table": table,
>                                                  "chain": chain,
>                                                  "priority": "%d" % priority })
>-                handler.ignorableWhitespace(joinArgs(args))
>+                handler.ignorableWhitespace(sax.saxutils.escape(joinArgs(args)))
>                 handler.endElement("rule")
>                 handler.ignorableWhitespace("\n")
> 
>@@ -359,7 +360,7 @@ class Direct(IO_Object):
>                     continue
>                 handler.ignorableWhitespace("  ")
>                 handler.startElement("passthrough", { "ipv": ipv })
>-                handler.ignorableWhitespace(joinArgs(args))
>+                handler.ignorableWhitespace(sax.saxutils.escape(joinArgs(args)))
>                 handler.endElement("passthrough")
>                 handler.ignorableWhitespace("\n")
> 
>diff --git a/src/firewall/core/io/io_object.py b/src/firewall/core/io/io_object.py
>index 2d5f85b..12e9e82 100644
>--- a/src/firewall/core/io/io_object.py
>+++ b/src/firewall/core/io/io_object.py
>@@ -172,6 +172,9 @@ class IO_Object_ContentHandler(sax.handler.ContentHandler):
>     def startDocument(self):
>         self._element = ""
> 
>+    def startElement(self, name):
>+        self._element = ""
>+
>     def endElement(self, name):
>         if name == "short":
>             self.item.short = self._element
>@@ -179,7 +182,7 @@ class IO_Object_ContentHandler(sax.handler.ContentHandler):
>             self.item.description = self._element
> 
>     def characters(self, content):
>-        self._element = content.replace('\n', ' ')
>+        self._element += content.replace('\n', ' ')
> 
> class IO_Object_XMLGenerator(saxutils.XMLGenerator):
>     def __init__(self, out):

Actions: View | Diff

Attachments on bug 1065738: 863732