C#: Convert System.Nullable<> flow to CSV format.

michaelnebel · michaelnebel · commit 15b4b218c826 · 2021-12-09T16:34:42.000+01:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/LibraryTypeDataFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/LibraryTypeDataFlow.qll
@@ -546,49 +546,6 @@ class SystemTextStringBuilderFlow extends LibraryTypeDataFlow, SystemTextStringB
   }
 }
 
-/** Data flow for `System.Nullable<>`. */
-class SystemNullableFlow extends LibraryTypeDataFlow, SystemNullableStruct {
-  override predicate callableFlow(
-    CallableFlowSource source, AccessPath sourceAp, CallableFlowSink sink, AccessPath sinkAp,
-    SourceDeclarationCallable c, boolean preservesValue
-  ) {
-    preservesValue = true and
-    c.(Constructor).getDeclaringType() = this and
-    source = getFlowSourceArg(c, 0, sourceAp) and
-    sourceAp = AccessPath::empty() and
-    sink = TCallableFlowSinkReturn() and
-    sinkAp = AccessPath::property(this.getValueProperty())
-    or
-    preservesValue = true and
-    c = this.getAGetValueOrDefaultMethod() and
-    source = TCallableFlowSourceQualifier() and
-    sourceAp = AccessPath::property(this.getValueProperty()) and
-    sink = TCallableFlowSinkReturn() and
-    sinkAp = AccessPath::empty()
-    or
-    preservesValue = false and
-    c = this.getHasValueProperty().getGetter() and
-    source = TCallableFlowSourceQualifier() and
-    sourceAp = AccessPath::property(this.getValueProperty()) and
-    sink = TCallableFlowSinkReturn() and
-    sinkAp = AccessPath::empty()
-    or
-    preservesValue = true and
-    c = this.getAGetValueOrDefaultMethod() and
-    source = getFlowSourceArg(c, 0, _) and
-    sourceAp = AccessPath::empty() and
-    sink = TCallableFlowSinkReturn() and
-    sinkAp = AccessPath::empty()
-    or
-    preservesValue = false and
-    c = this.getValueProperty().getGetter() and
-    source = TCallableFlowSourceQualifier() and
-    sourceAp = AccessPath::empty() and
-    sink = TCallableFlowSinkReturn() and
-    sinkAp = AccessPath::empty()
-  }
-}
-
 /** Data flow for `System.Collections.IEnumerable` (and sub types). */
 class IEnumerableFlow extends LibraryTypeDataFlow, RefType {
   IEnumerableFlow() { this.getABaseType*() instanceof SystemCollectionsIEnumerableInterface }
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/System.qll
@@ -299,6 +299,21 @@ class SystemNullableStruct extends SystemUnboundGenericStruct {
   }
 }
 
+/** Data flow for `System.Nullable<>`. */
+private class SystemNullableFlowModelCsv extends SummaryModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        "System;Nullable<>;false;GetValueOrDefault;();;Property[System.Nullable<>.Value] of Argument[-1];ReturnValue;value",
+        "System;Nullable<>;false;GetValueOrDefault;(T);;Argument[0];ReturnValue;value",
+        "System;Nullable<>;false;GetValueOrDefault;(T);;Property[System.Nullable<>.Value] of Argument[-1];ReturnValue;value",
+        "System;Nullable<>;false;Nullable;(T);;Argument[0];Property[System.Nullable<>.Value] of ReturnValue;value",
+        "System;Nullable<>;false;get_HasValue;();;Property[System.Nullable<>.Value] of Argument[-1];ReturnValue;taint",
+        "System;Nullable<>;false;get_Value;();;Argument[-1];ReturnValue;taint",
+      ]
+  }
+}
+
 /** The `System.NullReferenceException` class. */
 class SystemNullReferenceExceptionClass extends SystemClass {
   SystemNullReferenceExceptionClass() { this.hasName("NullReferenceException") }
