Imported Upstream version 5.20.0.197
Former-commit-id: 5c07c43a31eac4feaa80af83fcfd029473b7f9c8
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
fad63d06c9
commit
335b1cf07f
@ -1 +1 @@
|
||||
42d9284971bf51d3e040505f0c7b9b308011035b
|
||||
614e386f452de288ad25cf8bcc6cc8c52895725e
|
||||
@ -1 +1 @@
|
||||
b23890c3e29672d68a1fe844443ac09ff25a2ac9
|
||||
a6e1aaf149f62742bb8957ffa3a03529a6b46dbe
|
||||
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.0.191";
|
||||
public const string MonoVersion = "5.20.0.197";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -277,11 +277,24 @@ namespace System.Reflection.Emit {
|
||||
return System.Text.Encoding.UTF8.GetString(data, pos, len);
|
||||
}
|
||||
|
||||
internal static string decode_string (byte [] data, int pos, out int rpos)
|
||||
{
|
||||
if (data [pos] == 0xff) {
|
||||
rpos = pos + 1;
|
||||
return null;
|
||||
} else {
|
||||
int len = decode_len (data, pos, out pos);
|
||||
string s = string_from_bytes (data, pos, len);
|
||||
pos += len;
|
||||
rpos = pos;
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
internal string string_arg ()
|
||||
{
|
||||
int pos = 2;
|
||||
int len = decode_len (data, pos, out pos);
|
||||
return string_from_bytes (data, pos, len);
|
||||
return decode_string (data, pos, out pos);
|
||||
}
|
||||
|
||||
internal static UnmanagedMarshal get_umarshal (CustomAttributeBuilder customBuilder, bool is_field) {
|
||||
@ -309,18 +322,14 @@ namespace System.Reflection.Emit {
|
||||
int paramType; // What is this ?
|
||||
|
||||
/* Skip field/property signature */
|
||||
pos ++;
|
||||
int fieldPropSig = (int)data [pos ++];
|
||||
/* Read type */
|
||||
paramType = ((int)data [pos++]);
|
||||
if (paramType == 0x55) {
|
||||
/* enums, the value is preceeded by the type */
|
||||
int len2 = decode_len (data, pos, out pos);
|
||||
string_from_bytes (data, pos, len2);
|
||||
pos += len2;
|
||||
decode_string (data, pos, out pos);
|
||||
}
|
||||
int len = decode_len (data, pos, out pos);
|
||||
string named_name = string_from_bytes (data, pos, len);
|
||||
pos += len;
|
||||
string named_name = decode_string (data, pos, out pos);
|
||||
|
||||
switch (named_name) {
|
||||
case "ArraySubType":
|
||||
@ -349,9 +358,7 @@ namespace System.Reflection.Emit {
|
||||
pos += 4;
|
||||
break;
|
||||
case "SafeArrayUserDefinedSubType":
|
||||
len = decode_len (data, pos, out pos);
|
||||
string_from_bytes (data, pos, len);
|
||||
pos += len;
|
||||
decode_string (data, pos, out pos);
|
||||
break;
|
||||
case "SizeParamIndex":
|
||||
value = (int)data [pos++];
|
||||
@ -360,20 +367,15 @@ namespace System.Reflection.Emit {
|
||||
hasSize = true;
|
||||
break;
|
||||
case "MarshalType":
|
||||
len = decode_len (data, pos, out pos);
|
||||
marshalTypeName = string_from_bytes (data, pos, len);
|
||||
pos += len;
|
||||
marshalTypeName = decode_string (data, pos, out pos);
|
||||
break;
|
||||
case "MarshalTypeRef":
|
||||
len = decode_len (data, pos, out pos);
|
||||
marshalTypeName = string_from_bytes (data, pos, len);
|
||||
marshalTypeRef = Type.GetType (marshalTypeName);
|
||||
pos += len;
|
||||
marshalTypeName = decode_string (data, pos, out pos);
|
||||
if (marshalTypeName != null)
|
||||
marshalTypeRef = Type.GetType (marshalTypeName);
|
||||
break;
|
||||
case "MarshalCookie":
|
||||
len = decode_len (data, pos, out pos);
|
||||
marshalCookie = string_from_bytes (data, pos, len);
|
||||
pos += len;
|
||||
marshalCookie = decode_string (data, pos, out pos);
|
||||
break;
|
||||
default:
|
||||
throw new Exception ("Unknown MarshalAsAttribute field: " + named_name);
|
||||
|
||||
@ -9,6 +9,7 @@ using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Reflection.Emit;
|
||||
using System.Threading;
|
||||
using System.Runtime.InteropServices;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace MonoTests.System.Reflection.Emit
|
||||
@ -845,6 +846,59 @@ namespace MonoTests.System.Reflection.Emit
|
||||
assemblyBuilder1.Save ("Repro55681-2a.dll");
|
||||
}
|
||||
|
||||
[DllImport("SomeLib")]
|
||||
private static extern void MethodForNullStringMarshalAsFields([MarshalAs(UnmanagedType.LPWStr)] string param);
|
||||
|
||||
[Test]
|
||||
public void NullStringMarshalAsFields () {
|
||||
// Regression test for https://github.com/mono/mono/issues/12747
|
||||
//
|
||||
// MarshalAsAttribute goes through
|
||||
// CustomAttributeBuilder.get_umarshal which tries to
|
||||
// build an UnmanagedMarshal value by decoding the CAB's data.
|
||||
//
|
||||
// The data decoding needs to handle null string (encoded as 0xFF) properly.
|
||||
var aName = new AssemblyName("Repro12747");
|
||||
var assembly = AppDomain.CurrentDomain.DefineDynamicAssembly(aName, AssemblyBuilderAccess.RunAndSave, tempDir);
|
||||
var module = assembly.DefineDynamicModule(aName.Name, aName.Name + ".dll");
|
||||
|
||||
var prototypeMethodName = nameof(MethodForNullStringMarshalAsFields);
|
||||
var someMethod = this.GetType().GetMethod(prototypeMethodName, BindingFlags.Static | BindingFlags.NonPublic);
|
||||
|
||||
var typeBuilder = module.DefineType("NewType" + module.ToString(), TypeAttributes.Class | TypeAttributes.Public);
|
||||
var methodBuilder = typeBuilder.DefineMethod("NewMethod", MethodAttributes.Public | MethodAttributes.HideBySig, typeof(void), new[] { typeof(string) });
|
||||
var il = methodBuilder.GetILGenerator();
|
||||
il.Emit(OpCodes.Ret);
|
||||
|
||||
var param = someMethod.GetParameters()[0];
|
||||
var paramBuilder = methodBuilder.DefineParameter(1, param.Attributes, null);
|
||||
MarshalAsAttribute attr = param.GetCustomAttribute<MarshalAsAttribute>();
|
||||
var attrCtor = typeof(MarshalAsAttribute).GetConstructor(new[] { typeof(UnmanagedType) });
|
||||
object[] attrCtorArgs = { attr.Value };
|
||||
|
||||
// copy over the fields from the real MarshalAsAttribute on the parameter of "MethodForNullStringMarshalAsFields",
|
||||
// including the ones that were initialized to null
|
||||
var srcFields = typeof(MarshalAsAttribute).GetFields(BindingFlags.Public | BindingFlags.Instance);
|
||||
var fieldArguments = new FieldInfo[srcFields.Length];
|
||||
var fieldArgumentValues = new object[srcFields.Length];
|
||||
for(int i = 0; i < srcFields.Length; i++)
|
||||
{
|
||||
var field = srcFields[i];
|
||||
fieldArguments[i] = field;
|
||||
fieldArgumentValues[i] = field.GetValue(attr);
|
||||
}
|
||||
|
||||
var attrBuilder = new CustomAttributeBuilder(attrCtor, attrCtorArgs, Array.Empty<PropertyInfo>(), Array.Empty<object>(),
|
||||
fieldArguments, fieldArgumentValues);
|
||||
// this encodes the CustomAttributeBuilder as a data
|
||||
// blob and then tries to decode it using
|
||||
// CustomAttributeBuilder.get_umarshal
|
||||
paramBuilder.SetCustomAttribute(attrBuilder);
|
||||
|
||||
var finalType = typeBuilder.CreateType();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
798ab98b275858de38ea9093f694ac55c9a86318
|
||||
383ae3ef9dd1b2c400ec51ee81f2076d5153746c
|
||||
@ -1 +1 @@
|
||||
807ee298114e63cab56ac11f23f724b64361593e
|
||||
11edb02350ed75b55fc884159ac11000eb956a3a
|
||||
@ -1 +1 @@
|
||||
d16a9e3f8d92c7681eb5e092d7df6b513c4d44ab
|
||||
1bd22293b7b92de83e22d39e1ff97fa286c884e3
|
||||
@ -1 +1 @@
|
||||
4be30bfda39da9a2ecdc34470e4665c753304cb5
|
||||
1cb06e425be41ed94546d04d837e9432db750448
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
8e522da568214f396478998d70a9137bedfc4bd4
|
||||
adc618f49511118ee5f21252b88d3949f71dfcde
|
||||
@ -1 +1 @@
|
||||
c5f9829e33f69207ea8aac86b8ec8e2b64ff87b9
|
||||
9e2aafee7d31e49a01f1502aa00b67c1a1904fb0
|
||||
@ -1 +1 @@
|
||||
eabd0a96a209dae105d82f03d3f1030ea31917f9
|
||||
fbd3f505c8886e1d95a5a83c8e1d0976059a4233
|
||||
@ -1 +1 @@
|
||||
cd9d8e97314061d17467eb14aeda7610bc40a15d
|
||||
d61f67c1b8380fb0ee08877aa66ef1ea23aca853
|
||||
@ -1 +1 @@
|
||||
807ee298114e63cab56ac11f23f724b64361593e
|
||||
11edb02350ed75b55fc884159ac11000eb956a3a
|
||||
@ -1 +1 @@
|
||||
d16a9e3f8d92c7681eb5e092d7df6b513c4d44ab
|
||||
1bd22293b7b92de83e22d39e1ff97fa286c884e3
|
||||
@ -1 +1 @@
|
||||
4be30bfda39da9a2ecdc34470e4665c753304cb5
|
||||
1cb06e425be41ed94546d04d837e9432db750448
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
8e522da568214f396478998d70a9137bedfc4bd4
|
||||
adc618f49511118ee5f21252b88d3949f71dfcde
|
||||
@ -1 +1 @@
|
||||
c5f9829e33f69207ea8aac86b8ec8e2b64ff87b9
|
||||
9e2aafee7d31e49a01f1502aa00b67c1a1904fb0
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user