fix empty bytes object construction

irmen · May 15, 2023 · badc8fe · badc8fe
1 parent d677540
commit badc8fe
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 70 deletions.
diff --git a/dotnet/Razorvine.Pickle/Benchmarks/Benchmarks.csproj b/dotnet/Razorvine.Pickle/Benchmarks/Benchmarks.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.11.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/dotnet/Razorvine.Pickle/Pickle/Pickle.csproj b/dotnet/Razorvine.Pickle/Pickle/Pickle.csproj
@@ -8,9 +8,9 @@
     <Authors>Irmen de Jong</Authors>
     <Product>Python pickle serialization protocol library for .NET</Product>
     <PackageId>Razorvine.Pickle</PackageId>
-    <Version>1.3.0</Version>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
+    <Version>1.4.0</Version>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <FileVersion>1.4.0.0</FileVersion>
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
     <AssemblyOriginatorKeyFile>Pickle.snk</AssemblyOriginatorKeyFile>
@@ -25,6 +25,6 @@
     <PackageReleaseNotes>Stand alone pickle library.</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 </Project>
diff --git a/dotnet/Razorvine.Pickle/Pickle/Pickle/Objects/ByteArrayConstructor.cs b/dotnet/Razorvine.Pickle/Pickle/Pickle/Objects/ByteArrayConstructor.cs
@@ -15,9 +15,13 @@ public class ByteArrayConstructor : IObjectConstructor {
 	public object construct(object[] args) {
 		// args for bytearray constructor: [ String string, String encoding ]
 		// args for bytearray constructor (from python3 bytes): [ ArrayList ] or just [byte[]] (when it uses BINBYTES opcode)
-		if (args.Length != 1 && args.Length != 2)
+		// or, zero arguments: empty bytearray.
+		if (args.Length>2)
 			throw new PickleException("invalid pickle data for bytearray; expected 1 or 2 args, got "+args.Length);
 
+		if (args.Length == 0)
+			return new byte[]{};
+
 		if(args.Length==1) {
 			if(args[0] is byte[]) {
 				return args[0];

diff --git a/dotnet/Razorvine.Pickle/UnitTests/Pickle/UnpicklerTests.cs b/dotnet/Razorvine.Pickle/UnitTests/Pickle/UnpicklerTests.cs
@@ -407,6 +407,15 @@ public void TestBytesAndByteArray()
 		Assert.Equal(Encoding.ASCII.GetBytes("ABCDEFGH"), (byte[])U(p3));
 	}
 
+	[Fact]
+	public void TestUnpickleEmptyBytes() {
+		byte[] pickled = {
+			128, 2, 99, 95, 95, 98, 117, 105, 108, 116, 105, 110, 95, 95, 10, 98, 121, 116, 101, 115, 10, 113, 0, 41, 82, 113, 1, 46
+		};
+		byte[] obj = (byte[]) (new Unpickler().loads(pickled));
+		Assert.Empty(obj);
+	}
+
 	[Fact]
 	public void TestArray() 
 	{

diff --git a/dotnet/Razorvine.Pickle/UnitTests/UnitTests.csproj b/dotnet/Razorvine.Pickle/UnitTests/UnitTests.csproj
@@ -7,9 +7,9 @@
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/java/.idea/compiler.xml b/java/.idea/compiler.xml
diff --git a/java/.idea/libraries/Maven__junit_junit_4_13_1.xml b/java/.idea/libraries/Maven__junit_junit_4_13_1.xml
diff --git a/java/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/java/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
diff --git a/java/.idea/misc.xml b/java/.idea/misc.xml
diff --git a/java/.idea/modules.xml b/java/.idea/modules.xml
diff --git a/java/pickle.iml b/java/pickle.iml
diff --git a/java/src/main/java/net/razorvine/pickle/objects/ByteArrayConstructor.java b/java/src/main/java/net/razorvine/pickle/objects/ByteArrayConstructor.java
@@ -16,8 +16,12 @@ public class ByteArrayConstructor implements IObjectConstructor {
 	public Object construct(Object[] args) throws PickleException {
 		// args for bytearray constructor: [ String string, String encoding ]
 		// args for bytearray constructor (from python3 bytes): [ ArrayList<Number> ] or just [byte[]] (when it uses BINBYTES opcode)
-		if (args.length != 1 && args.length != 2)
-			throw new PickleException("invalid pickle data for bytearray; expected 1 or 2 args, got "+args.length);
+		// or, zero arguments: empty bytearray.
+		if (args.length>2)
+			throw new PickleException("invalid pickle data for bytearray; expected 0, 1 or 2 args, got "+args.length);
+
+		if(args.length==0)
+			return new byte[0];
 
 		if(args.length==1) {
 			if(args[0] instanceof byte[]) {

diff --git a/java/src/main/java/net/razorvine/pickle/objects/package-info.java b/java/src/main/java/net/razorvine/pickle/objects/package-info.java
@@ -2,7 +2,7 @@
  * Object constructors and other utility classes for the pickle package.
  *
  * @author Irmen de Jong (irmen@razorvine.net)
- * @version 1.2
+ * @version 1.4
  * @see net.razorvine.pickle
  */
 package net.razorvine.pickle.objects;
diff --git a/java/src/main/java/net/razorvine/pickle/package-info.java b/java/src/main/java/net/razorvine/pickle/package-info.java
@@ -10,7 +10,7 @@
  * functionality.
  *
  * @author Irmen de Jong (irmen@razorvine.net)
- * @version 1.2
+ * @version 1.4
  */
 package net.razorvine.pickle;
 
diff --git a/java/src/test/java/net/razorvine/pickle/test/UnpicklerTest.java b/java/src/test/java/net/razorvine/pickle/test/UnpicklerTest.java
@@ -498,6 +498,15 @@ public void testBytesAndByteArray() throws IOException
 		assertArrayEquals(new byte[]{'A','B','C','D','E','F','G','H'}, (byte[])U(p3));
 	}
 
+	@Test
+	public void testUnpickleEmptyBytes() throws IOException {
+		byte[] pickled = new byte[] {
+				(byte)128, 2, 99, 95, 95, 98, 117, 105, 108, 116, 105, 110, 95, 95, 10, 98, 121, 116, 101, 115, 10, 113, 0, 41, 82, 113, 1, 46
+		};
+		byte[] obj = (byte[]) (new Unpickler().loads(pickled));
+		assertEquals(0, obj.length);
+	}
+
 	@Test
 	public void testArray() throws PickleException, IOException
 	{