diff options
Diffstat (limited to 'runtime/ClassLoaderWrapper.cs')
| -rw-r--r-- | runtime/ClassLoaderWrapper.cs | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/runtime/ClassLoaderWrapper.cs b/runtime/ClassLoaderWrapper.cs index 680923b1..f9bb0b45 100644 --- a/runtime/ClassLoaderWrapper.cs +++ b/runtime/ClassLoaderWrapper.cs @@ -238,17 +238,28 @@ class ClassLoaderWrapper { dims++; } - switch(name[dims]) + if(name[dims] == 'L') { - case 'L': + if(!name.EndsWith(";") || name.Length <= dims + 2 || name[dims + 1] == '[') { - type = LoadClassByDottedNameFast(name.Substring(dims + 1, name.IndexOf(';', dims) - dims - 1)); - if(type != null) - { - type = type.GetClassLoader().CreateArrayType(name, type.TypeAsArrayType, dims); - } - return type; + // malformed class name + return null; } + string elemClass = name.Substring(dims + 1, name.Length - dims - 2); + type = LoadClassByDottedNameFast(elemClass); + if(type != null) + { + type = type.GetClassLoader().CreateArrayType(name, type.TypeAsArrayType, dims); + } + return type; + } + if(name.Length != dims + 1) + { + // malformed class name + return null; + } + switch(name[dims]) + { case 'B': return GetBootstrapClassLoader().CreateArrayType(name, PrimitiveTypeWrapper.BYTE.TypeAsArrayType, dims); case 'C': |