Rewrite with different flow state

Author: owen-mc

go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll

@@ -24,7 +24,6 @@ where
   call.getResult(0) = source.getNode() and
   sinkConverted = sink.getNode().getASuccessor()
 select sinkConverted, source, sink,
-  "Incorrect conversion of " +
-    describeBitSize(getSourceBitSize(sink.getState()), getIntTypeBitSize(source.getNode().getFile()))
-    + " from $@ to a lower bit size type " + sinkConverted.getType().getUnderlyingType().getName() +
+  "Incorrect conversion of " + describeBitSize2(source.getNode()) +
+    " from $@ to a lower bit size type " + sinkConverted.getType().getUnderlyingType().getName() +
     " without an upper bound check.", source, call.getTarget().getQualifiedName()

go/ql/src/Security/CWE-681/IncorrectIntegerConversionQuery.ql

@@ -134,7 +134,7 @@ func testParseUint() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int8(parsed)
+		_ = int8(parsed) // $ hasValueFlow="type conversion"
 		_ = uint8(parsed)
 		_ = int16(parsed)
 		_ = uint16(parsed)
@@ -152,7 +152,7 @@ func testParseUint() {
 		}
 		_ = int8(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint8(parsed) // $ hasValueFlow="type conversion"
-		_ = int16(parsed)
+		_ = int16(parsed) // $ hasValueFlow="type conversion"
 		_ = uint16(parsed)
 		_ = int32(parsed)
 		_ = uint32(parsed)
@@ -170,11 +170,11 @@ func testParseUint() {
 		_ = uint8(parsed)  // $ hasValueFlow="type conversion"
 		_ = int16(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint16(parsed) // $ hasValueFlow="type conversion"
-		_ = int32(parsed)
+		_ = int32(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint32(parsed)
 		_ = int64(parsed)
 		_ = uint64(parsed)
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 	{
@@ -188,7 +188,7 @@ func testParseUint() {
 		_ = uint16(parsed) // $ hasValueFlow="type conversion"
 		_ = int32(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint32(parsed) // $ hasValueFlow="type conversion"
-		_ = int64(parsed)
+		_ = int64(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint64(parsed)
 		_ = int(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint(parsed) // $ hasValueFlow="type conversion"
@@ -204,9 +204,9 @@ func testParseUint() {
 		_ = uint16(parsed) // $ hasValueFlow="type conversion"
 		_ = int32(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint32(parsed) // $ hasValueFlow="type conversion"
-		_ = int64(parsed)
+		_ = int64(parsed)  // $ hasValueFlow="type conversion"
 		_ = uint64(parsed)
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 }

go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.go

@@ -20,7 +20,7 @@ func testIntSource386() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int32(parsed)
+		_ = int32(parsed) // $ hasValueFlow="type conversion"
 		_ = uint32(parsed)
 	}
 	{

go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraintInFileName_386.go

@@ -23,7 +23,7 @@ func testIntSource32() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int32(parsed)
+		_ = int32(parsed) // $ hasValueFlow="type conversion"
 		_ = uint32(parsed)
 	}
 	{

go/ql/test/query-tests/Security/CWE-681/Test32BitArchitectureBuildConstraints.go

@@ -20,7 +20,7 @@ func testIntSinkAmd64() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 }

go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraintInFileName_amd64.go

@@ -23,7 +23,7 @@ func testIntSink64() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 }

go/ql/test/query-tests/Security/CWE-681/Test64BitArchitectureBuildConstraints.go

@@ -24,7 +24,7 @@ func oldTestIntSink64() {
 		if err != nil {
 			panic(err)
 		}
-		_ = int(parsed)
+		_ = int(parsed) // $ hasValueFlow="type conversion"
 		_ = uint(parsed)
 	}
 }