Perform SqlHexDecode transformation in-place

- Validate buffer size before accessing data. The previous
  implementation would only check that there was a character available
  in the buffer but could continue processing/reading characters from
  an hex representation without checking bounds.
- Removed inplace & mytolower helper functions from the class, as
  they're only referenced by the implementation.
- Removed duplicate VALID_HEX & ISODIGIT macros, already in
  src/utils/string.h.

Author: eduar-hte

src/actions/transformations/sql_hex_decode.cc

@@ -23,79 +23,50 @@
 namespace modsecurity::actions::transformations {
 
 
-#ifndef VALID_HEX
-#define VALID_HEX(X) (((X >= '0') && (X <= '9')) \
-    || ((X >= 'a') && (X <= 'f')) \
-    || ((X >= 'A') && (X <= 'F')))
-#endif
-#ifndef ISODIGIT
-#define ISODIGIT(X) ((X >= '0') && (X <= '7'))
-#endif
-
-bool SqlHexDecode::transform(std::string &value, const Transaction *trans) const {
-    std::string ret;
-    unsigned char *input;
-    int size = 0;
-
-    input = reinterpret_cast<unsigned char *>
-        (malloc(sizeof(char) * value.length()+1));
-
-    if (input == NULL) {
-        return "";
-    }
-
-    memcpy(input, value.c_str(), value.length()+1);
-
-    size = inplace(input, value.length());
-
-    ret.assign(reinterpret_cast<char *>(input), size);
-    free(input);
-
-    const auto changed = ret != value;
-    value = ret;
-    return changed;
+static inline int mytolower(int ch) {
+    if (ch >= 'A' && ch <= 'Z')
+        return ('a' + ch - 'A');
+    else
+        return ch;
 }
 
-
-int SqlHexDecode::inplace(unsigned char *data, int len) {
-    unsigned char *d, *begin = data;
-    int count = 0;
-
-    if ((data == NULL) || (len == 0)) {
-        return 0;
+static inline bool inplace(std::string &value) {
+    if (value.empty()) {
+        return false;
     }
 
-    for (d = data; (++count < len) && *data; *d++ = *data++) {
-        if (*data != '0') {
-            continue;
+    auto d = reinterpret_cast<unsigned char*>(value.data());
+    const unsigned char *data = d;
+    const auto end = data + value.size();
+
+    bool changed = false;
+
+    while (data < end) {
+        if (data + 3 < end
+            && *data == '0'
+            && mytolower(*(data + 1)) == 'x'
+            && VALID_HEX(*(data + 2)) && VALID_HEX(*(data + 3))) {
+            data += 2;  // skip '0x'
+            do {
+                *d++ = utils::string::x2c(data);
+                data += 2;
+            } while ((data + 1 < end) && VALID_HEX(*data) && VALID_HEX(*(data + 1)));
+            changed = true;
         }
-        ++data;
-        ++count;
-        if (mytolower(*data) != 'x') {
-            data--;
-            count--;
-            continue;
+        else {
+            *d++ = *data++;
         }
+    }
 
-        data++;
-        ++count;
+    *d = '\0';
 
-        // Do we need to keep "0x" if no hexa after?
-        if (!VALID_HEX(data[0]) || !VALID_HEX(data[1])) {
-            data -= 2;
-            count -= 2;
-            continue;
-        }
+    value.resize(d - reinterpret_cast<const unsigned char*>(value.c_str()));
+    return changed;
+}
 
-        while (VALID_HEX(data[0]) && VALID_HEX(data[1])) {
-            *d++ = utils::string::x2c(data);
-            data += 2;
-            count += 2;
-        }
-    }
 
-    *d = '\0';
-    return strlen(reinterpret_cast<char *>(begin));
+bool SqlHexDecode::transform(std::string &value, const Transaction *trans) const {
+    return inplace(value);
 }
 
 

src/actions/transformations/sql_hex_decode.h

@@ -26,15 +26,6 @@ class SqlHexDecode : public Transformation {
         : Transformation(action) { }
 
     bool transform(std::string &value, const Transaction *trans) const override;
-
-    static int inplace(unsigned char *data, int len);
-
-    static int mytolower(int ch) {
-        if (ch >= 'A' && ch <= 'Z')
-            return ('a' + ch - 'A');
-        else
-            return ch;
-    }
 };
 
 }  // namespace modsecurity::actions::transformations