From d17b62d7fca7647a1e935285869b93856c924890 Mon Sep 17 00:00:00 2001

From: Petr Oros <poros@redhat.com>

Date: Tue, 15 Aug 2017 09:18:02 +0200

Subject: [PATCH 1/1] Escape special characters in html output

Signed-off-by Petr Oros <poros@redhat.com>

---

 src/core/print.cc | 77 +++++++++++++++++++++++++++++++++++++++----------------

 1 file changed, 55 insertions(+), 22 deletions(-)

diff --git a/src/core/print.cc b/src/core/print.cc

index 5df078e..958bf6a 100644

--- a/src/core/print.cc

+++ b/src/core/print.cc

@@ -156,10 +156,13 @@ int level)

         cout << "";

       cout << "handle: ";

       if (html)

+      {

         cout << "";

-      cout << node.getHandle();

-      if (html)

+        cout << escape(node.getHandle());

         cout << "";

+      }

+      else

+        cout << node.getHandle()

       cout << endl;

     }

 #endif

@@ -174,10 +177,13 @@ int level)

         cout << "";

       cout << _("description") << ": ";

       if (html)

+      {

         cout << "";

-      cout << node.getDescription();

-      if (html)

+        cout << escape(node.getDescription());

         cout << "";

+      }

+      else

+        cout << node.getDescription();

       cout << endl;

     }

@@ -188,10 +194,13 @@ int level)

         cout << "";

       cout << _("product") << ": ";

       if (html)

+      {

         cout << "";

-      cout << node.getProduct();

-      if (html)

+        cout << escape(node.getProduct());

         cout << "";

+      }

+      else

+        cout << node.getProduct();

       cout << endl;

     }

@@ -202,10 +211,13 @@ int level)

         cout << "";

       cout << _("vendor") << ": ";

       if (html)

+      {

         cout << "";

-      cout << node.getVendor();

-      if (html)

+        cout << escape(node.getVendor());

         cout << "";

+      }

+      else

+        cout << node.getVendor();

       cout << endl;

     }

@@ -216,10 +228,13 @@ int level)

         cout << "";

       cout << _("physical id") << ": ";

       if (html)

+      {

         cout << "
";

-      cout << node.getPhysId();

-      if (html)

+        cout << escape(node.getPhysId());

         cout << "";

+      }

+      else

+        cout << node.getPhysId();

       cout << endl;

     }

@@ -230,10 +245,13 @@ int level)

         cout << "";

       cout << _("bus info") << ": ";

       if (html)

+      {

         cout << "
";

-      cout << node.getBusInfo();

-      if (html)

+        cout << escape(node.getBusInfo());

         cout << "";

+      }

+      else

+        cout << node.getBusInfo();

       cout << endl;

     }

@@ -248,10 +266,13 @@ int level)

           cout << "";

         cout << _("logical name") << ": ";

         if (html)

+        {

           cout << "
";

-        cout << logicalnames[i];

-        if (html)

+          cout << escape(logicalnames[i]);

           cout << "";

+        }

+        else

+          cout << logicalnames[i];

         cout << endl;

       }

     }

@@ -263,10 +284,13 @@ int level)

         cout << "";

       cout << _("version") << ": ";

       if (html)

+      {

         cout << "";

-      cout << node.getVersion();

-      if (html)

+        cout << escape(node.getVersion());

         cout << "";

+      }

+      else

+        cout << node.getVersion();

       cout << endl;

     }

@@ -277,10 +301,13 @@ int level)

         cout << "";

       cout << _("date") << ": ";

       if (html)

+      {

         cout << "";

-      cout << node.getDate();

-      if (html)

+        cout << escape(node.getDate());

         cout << "";

+      }

+      else

+        cout << node.getDate();

       cout << endl;

     }

@@ -291,10 +318,13 @@ int level)

         cout << "";

       cout << _("serial") << ": ";

       if (html)

+      {

         cout << "";

-      cout << (enabled("output:sanitize")?REMOVED:node.getSerial());

-      if (html)

+        cout << escape(enabled("output:sanitize")?REMOVED:node.getSerial());

         cout << "";

+      }

+      else

+        cout << (enabled("output:sanitize")?REMOVED:node.getSerial());

       cout << endl;

     }

@@ -305,10 +335,13 @@ int level)

         cout << "";

       cout << _("slot") << ": ";

       if (html)

+      {

         cout << "";

-      cout << node.getSlot();

-      if (html)

+        cout << escape(node.getSlot());

         cout << "";

+      }

+      else

+        cout << node.getSlot();

       cout << endl;

     }

-- 

2.14.1