core: partially revert c35d3f5d - some chars must not be escaped

2022-09-17 02:07:07 +02:00
parent c35d3f5d0e
commit bf4c4fa9ef
1 changed files with 18 additions and 2 deletions
--- a/src/core/model/command-line.cc
+++ b/src/core/model/command-line.cc
@@ -71,8 +71,24 @@ Encode (const std::string & source)
        case '&':  buffer.append ("&amp;");          break;
        case '\"': buffer.append ("&quot;");         break;
        case '\'': buffer.append ("&apos;");         break;
-        case '>':  buffer.append ("&gt;");           break;
-        case '<':  buffer.append ("&lt;");           break;
+        // case '>':  buffer.append ("&gt;");           break;
+
+        case '<':  {
+          // Special case:
+          // "...blah <file..." is not allowed
+          // "...foo<bar..."  is allowed
+          if (buffer.back () == ' ')
+            {
+              buffer.append ("&lt;");
+            }
+          else
+            {
+              buffer.append ("<");
+            }
+
+          break;
+        }
+
        default:   buffer.append (&source[pos], 1);  break;
        }
      /* *NS_CHECK_STYLE_ON* */