Merge pull request #438 from mmd-osm/patch/cleanup21

Minor improvements escaping routines
zerebubuth · Aug 5, 2024 · 1dcc832 · 1dcc832
2 parents 641c8c7 + 26b4f73
commit 1dcc832
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/include/cgimap/util.hpp b/include/cgimap/util.hpp
@@ -44,27 +44,36 @@ inline size_t unicode_strlen(const std::string & s)
 }
 
 
-// TODO: Proper escaping function
-inline std::string escape(std::string_view input)
-{
+inline std::string escape(std::string_view input) {
 
-	std::string result = "\"";
+  int n = 0;
 
-	for (char i : input)
-	{
-		if (i == '\"')
-			result += "\\";
-		else if (i == '\\')
-			result += "\\";
+  // count chars to be escaped
+  for (char c : input) {
+    if (c == '"' || c == '\\')
+      ++n;
+  }
 
-		result += i;
-	}
+  std::string result;
+  result.reserve(input.size() + n + 2);   // input size + # of escaped chars + 2 enclosing quotes
 
-	result += "\"";
+  result += '"';
 
-	return result;
-}
+  if (n == 0) {
+    result += input;
+  } else {
+    for (char c : input) {
+      if (c == '"' || c == '\\')
+        result += '\\';
 
+      result += c;
+    }
+  }
+
+  result += '"';
+
+  return result;
+}
 
 // array_agg returns some curly brackets in the response. remove them for output
 // TODO: find a better way to do this.

diff --git a/src/backend/apidb/common_pgsql_selection.cpp b/src/backend/apidb/common_pgsql_selection.cpp
@@ -484,13 +484,13 @@ std::vector<std::string> psql_array_to_vector(std::string_view str) {
   for (unsigned int i = 1; i < str_size; i++) {
     if (str[i] == ',') {
       if (quotedValue) {
-        value += ",";
+        value += ',';
       } else {
         write = true;
       }
-    } else if (str[i] == '\"') {
+    } else if (str[i] == '"') {
       if (escaped) {
-        value += "\"";
+        value += '"';
         escaped = false;
       } else if (quotedValue) {
         quotedValue = false;
@@ -499,14 +499,14 @@ std::vector<std::string> psql_array_to_vector(std::string_view str) {
       }
     } else if (str[i] == '\\') {
       if (escaped) {
-        value += "\\";
+        value += '\\';
         escaped = false;
       } else {
         escaped = true;
       }
     } else if (str[i] == '}') {
       if (quotedValue) {
-        value += "}";
+        value += '}';
       } else {
         write = true;
       }