Foxhound: use full arguments for all DOM related Taint Operations

SAP · Jan 18, 2024 · 1362422 · 1362422
1 parent ca477c0
commit 1362422
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/dom/tainting/nsTaintingUtils.cpp b/dom/tainting/nsTaintingUtils.cpp
@@ -64,7 +64,7 @@ static TaintOperation GetTaintOperation(JSContext *cx, const char* name, const n
   if (cx && JS::CurrentGlobalOrNull(cx)) {
     JS::RootedValue argval(cx);
     if (mozilla::dom::ToJSValue(cx, arg, &argval)) {
-      return JS_GetTaintOperation(cx, name, argval);
+      return JS_GetTaintOperationFullArgs(cx, name, argval);
     }
   }
 
@@ -76,19 +76,6 @@ static TaintOperation GetTaintOperation(JSContext *cx, const char* name, const n
   if (cx && JS::CurrentGlobalOrNull(cx)) {
     JS::RootedValue argval(cx);
 
-    if (mozilla::dom::ToJSValue(cx, args, &argval)) {
-      return JS_GetTaintOperation(cx, name, argval);
-    }
-  }
-
-  return TaintOperation(name);
-}
-
-static TaintOperation GetTaintOperationFullArgs(JSContext *cx, const char* name, const nsTArray<nsString> &args)
-{
-  if (cx && JS::CurrentGlobalOrNull(cx)) {
-    JS::RootedValue argval(cx);
-
     if (mozilla::dom::ToJSValue(cx, args, &argval)) {
       return JS_GetTaintOperationFullArgs(cx, name, argval);
     }
@@ -117,7 +104,7 @@ static TaintOperation GetTaintOperation(JSContext *cx, const char* name, const m
     DescribeElement(element, elementDesc);
     args.AppendElement(elementDesc);
 
-    return GetTaintOperationFullArgs(cx, name, args);
+    return GetTaintOperation(cx, name, args);
   }
 
   return TaintOperation(name);