Skip to content

Commit 50a9b18

Browse files
authored
Merge pull request github#6579 from tamasvajk/fix/cil-type-args
C#: Fix completely broken type argument extraction in NoMetadataHandleType
2 parents c92b782 + b267d26 commit 50a9b18

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

csharp/extractor/Semmle.Extraction.CIL/Entities/NoMetadataHandleType.FullyQualifiedNameParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void ExtractTypeArguments(ref string name, int lastBracketIndex, out str
5353

5454
// "T3,[T4, Assembly1, Version=...],T5,T6"
5555
string typeArgs;
56-
(name, _, typeArgs, _) = name.Split(firstBracketIndex, firstBracketIndex + 1, lastBracketIndex - firstBracketIndex - 1);
56+
(name, _, typeArgs, _) = name.Split(firstBracketIndex, firstBracketIndex + 1, lastBracketIndex);
5757

5858
var thisTypeArgCount = GenericsHelper.GetGenericTypeParameterCount(name);
5959
if (thisTypeArgCount == 0)

csharp/extractor/Semmle.Util/StringExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static (string, string, string) Split(this string self, int index0, int i
2020
public static (string, string, string, string) Split(this string self, int index0, int index1, int index2)
2121
{
2222
var split = self.Split(new[] { index0, index1, index2 });
23-
return (split[0], split[1], split[2], split[4]);
23+
return (split[0], split[1], split[2], split[3]);
2424
}
2525

2626
private static List<string> Split(this string self, params int[] indices)

0 commit comments

Comments
 (0)