Wrap TaintSpew in compiler flag

SAP · Dec 3, 2024 · eda203a · eda203a
1 parent b51843e
commit eda203a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/js/src/jstaint.cpp b/js/src/jstaint.cpp
@@ -373,14 +373,19 @@ void JS::MarkTaintedFunctionArguments(JSContext* cx, JSFunction* function, const
 }
 
 void JS::MaybeSpewStringTaint(JSContext* cx, JSString* str) {
-//#ifdef JS_STRUCTURED_SPEW
+#ifdef JS_STRUCTURED_SPEW
   if (!str || !str->taint()) {
     return;
   }
 
   AutoStructuredSpewer spew(cx, SpewChannel::TaintFlowSpewer, cx->currentScript());
   if (spew) {
-    spew->property("str", str);
+    JSLinearString* linear = str->ensureLinear(cx);
+    if (linear) {
+      spew->property("str", linear);
+    } else {
+      spew->property("str", "Non-linear String!");
+    }
 
     spew->beginListProperty("taint");
     for (const TaintRange& range : str->taint()) {
@@ -419,7 +424,7 @@ void JS::MaybeSpewStringTaint(JSContext* cx, JSString* str) {
     spew->endList();
 
   }
-//#endif
+#endif
 }
 
 // Print a message to stdout.