Skip to content

fix(vendor/msgpack-cs): fix incorrect int32 serialization for negative values and default null parameters #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prikolium-cfx merged 2 commits into from
Jul 30, 2025
Merged

fix(vendor/msgpack-cs): fix incorrect int32 serialization for negative values and default null parameters #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcdef0d
fix(vendor/msgpack-cs): fix incorrect int32 serialization for negativ…
manups4e Jul 2, 2025
aa749c2
Fix(vendor/msgpack-cs): Allow null default params in msgpackfunc
manups4e Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 27 additions & 19 deletions MsgPack/MsgPackFunc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,28 +147,36 @@ private static MsgPackFunc ConstructDelegate(object target, MethodInfo method)
g.MarkLabel(lblOutOfRange);
if (parameter.IsOptional)
{
switch (parameter.DefaultValue)
if (parameter.DefaultValue is null)
{
case null: g.Emit(OpCodes.Ldnull); break;
case string v: g.Emit(OpCodes.Ldstr, v); break;

case byte v: g.Emit(OpCodes.Ldc_I4, v); break;
case ushort v: g.Emit(OpCodes.Ldc_I4, v); break;
case uint v: g.Emit(OpCodes.Ldc_I4, v); break;
case ulong v: g.Emit(OpCodes.Ldc_I4, v); break;
case sbyte v: g.Emit(OpCodes.Ldc_I4, v); break;
case short v: g.Emit(OpCodes.Ldc_I4, v); break;
case int v: g.Emit(OpCodes.Ldc_I4, v); break;
// Default is null: just load null on stack regardless of the type
g.Emit(OpCodes.Ldnull);
}

// Generic way to also support Nullable<> types
if (t.IsGenericType)
else
{
Type[] genericArguments = t.GetGenericArguments();
if (genericArguments.Length == 1)
g.Emit(OpCodes.Newobj, t.GetConstructor(genericArguments));
else
throw new ArgumentException($"Default value for {t} is unsupported.");
switch (parameter.DefaultValue)
{
case null: g.Emit(OpCodes.Ldnull); break;
case string v: g.Emit(OpCodes.Ldstr, v); break;

case byte v: g.Emit(OpCodes.Ldc_I4, v); break;
case ushort v: g.Emit(OpCodes.Ldc_I4, v); break;
case uint v: g.Emit(OpCodes.Ldc_I4, v); break;
case ulong v: g.Emit(OpCodes.Ldc_I4, v); break;
case sbyte v: g.Emit(OpCodes.Ldc_I4, v); break;
case short v: g.Emit(OpCodes.Ldc_I4, v); break;
case int v: g.Emit(OpCodes.Ldc_I4, v); break;
}

// Generic way to also support Nullable<> types
if (t.IsGenericType)
{
Type[] genericArguments = t.GetGenericArguments();
if (genericArguments.Length == 1)
g.Emit(OpCodes.Newobj, t.GetConstructor(genericArguments));
else
throw new ArgumentException($"Default value for {t} is unsupported.");
}
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion MsgPack/MsgPackSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public void Serialize(int v)
else if (v >= short.MinValue)
WriteBigEndian(MsgPackCode.Int16, (short)v);
else
WriteBigEndian(MsgPackCode.Int32, (short)v);
WriteBigEndian(MsgPackCode.Int32, v);
}
else
Serialize(unchecked((uint)v));
Expand Down