Fix NewExternalString length (#99)

DataDog · Mar 22, 2024 · 7643f11 · 7643f11
1 parent 7a9e608
commit 7643f11
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/tainted/string_resource.cc b/src/tainted/string_resource.cc
@@ -24,7 +24,8 @@ void StringResource::CopyCharArrToUint16Arr(const char* charArr, uint16_t* resul
 v8::Local<v8::String> NewExternalString(v8::Isolate* isolate, v8::Local<v8::Value> obj) {
     v8::String::Utf8Value originalStringValue(isolate, obj);
     const char* originalCharArr = *originalStringValue;
-    auto resource = new StringResource(originalCharArr, originalStringValue.length());
+    int length = v8::Local<v8::String>::Cast(obj)->Length();
+    auto resource = new StringResource(originalCharArr, length);
     return v8::String::NewExternalTwoByte(isolate, resource).ToLocalChecked();
 }
 }  // namespace tainted

diff --git a/test/js/new_tainted_string.spec.js b/test/js/new_tainted_string.spec.js
@@ -167,4 +167,16 @@ describe('Taint strings', function () {
     assert.strictEqual(true, TaintedUtils.isTainted(id, taintedOneChar), 'Must be tainted')
     assert.strictEqual(false, TaintedUtils.isTainted(id, oneChar), 'Can not be tainted')
   })
+
+  describe('Taint special one char strings', function () {
+    const specialOneCharStrings = ['佫', 'ü', 'ô', 'é', 'à']
+
+    specialOneCharStrings.forEach((testStr) => {
+      it(`Taint ${testStr}`, function () {
+        const taintedStr = TaintedUtils.newTaintedString(id, testStr, 'param', 'request')
+        assert.strictEqual(true, TaintedUtils.isTainted(id, taintedStr), 'Must be tainted')
+        assert.strictEqual(testStr, taintedStr, 'Strings must be equal')
+      })
+    })
+  })
 })