Escape special characters

Author: AlexDenisov

src/Properties.cpp

@@ -16,8 +16,30 @@ static std::string dropUnsupportedXmlChars(const std::string &input) {
   return output;
 }
 
+void replace(std::string &input, char c, const char *replacement) {
+  size_t pos = input.find(c);
+  while (pos != std::string::npos) {
+    input.replace(pos, 1, replacement);
+    pos = input.find(c, pos + 1);
+  }
+}
+
+static std::string escapeSpecialXmlCharacters(const std::string &input) {
+  std::string output = input;
+  replace(output, '&', "&");
+  replace(output, '"', """);
+  replace(output, '\'', "'");
+  replace(output, '<', "&lt;");
+  replace(output, '>', "&gt;");
+  return output;
+}
+
+static std::string sanitize(const std::string &input) {
+  return escapeSpecialXmlCharacters(dropUnsupportedXmlChars(input));
+}
+
 void Properties::setStringProperty(const std::string &key, const std::string &value) {
-  strings[key] = dropUnsupportedXmlChars(value);
+  strings[key] = sanitize(value);
 }
 
 void Properties::setBooleanProperty(const std::string &key, bool value) {

tests/integration-tests/regression/main.ll

@@ -1,9 +1,16 @@
 %0 = type opaque
 
+%"struct.std::_Rb_tree<std::__cxx11::basic_string<char>>::_Rb_tree_impl" = type opaque
+
+
 define internal i32 @"\01-[Shape square]"(%0*, i8*) {
   %3 = alloca %0*, align 8
   %4 = alloca i8*, align 8
   store %0* %0, %0** %3, align 8
   store i8* %1, i8** %4, align 8
   ret i32 42
+}
+
+define void @useStruct(%"struct.std::_Rb_tree<std::__cxx11::basic_string<char>>::_Rb_tree_impl"*) {
+  ret void
 }

tests/integration-tests/regression/test.groovy

@@ -19,5 +19,8 @@ def dump(tr) {
 dump(g.V().has('function', 'name', '-[Shape square]').valueMap('name'))
 // CHECK: name=[-[Shape square]]
 
+dump(g.V().has('type', 'type_id', 'struct_type').valueMap('name'))
+// CHECK: name=[struct.std::_Rb_tree<std::__cxx11::basic_string<char>>::_Rb_tree_impl]
+
 :exit
 // CHECK-EMPTY: