claunia/plist-cil
1
0
Fork 0
mirror of https://github.com/claunia/plist-cil.git synced 2025-12-16 19:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41 from quamotion/fixes/out-params

Browse Source 
ReadLengthAndOffset: Use out parameters instead of returning an array.
This commit is contained in:
Natalia Portillo
2018-06-19 21:10:42 +01:00
committed by GitHub
parent 5cbfb9ddc0 59f83610c7
commit e8112c76b1
1 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plist-cil/BinaryPropertyListParser.cs
View File

@@ -283,27 +283,19 @@ namespace Claunia.PropertyList
case 0x4: case 0x4:
{ {
//Data //Data
int[] lengthAndOffset = ReadLengthAndOffset(bytes, objInfo, offset); ReadLengthAndOffset(bytes, objInfo, offset, out int length, out int dataoffset);
int length = lengthAndOffset[0];
int dataoffset = lengthAndOffset[1];
return new NSData(CopyOfRange(bytes, offset + dataoffset, offset + dataoffset + length)); return new NSData(CopyOfRange(bytes, offset + dataoffset, offset + dataoffset + length));
} }
case 0x5: case 0x5:
{ {
//ASCII String //ASCII String, each character is 1 byte
int[] lengthAndOffset = ReadLengthAndOffset(bytes, objInfo, offset); ReadLengthAndOffset(bytes, objInfo, offset, out int length, out int stroffset);
int length = lengthAndOffset[0]; //Each character is 1 byte
int stroffset = lengthAndOffset[1];
return new NSString(bytes.Slice(offset + stroffset, length), "ASCII"); return new NSString(bytes.Slice(offset + stroffset, length), "ASCII");
} }
case 0x6: case 0x6:
{ {
//UTF-16-BE String //UTF-16-BE String
int[] lengthAndOffset = ReadLengthAndOffset(bytes, objInfo, offset); ReadLengthAndOffset(bytes, objInfo, offset, out int length, out int stroffset);
int length = lengthAndOffset[0];
int stroffset = lengthAndOffset[1];
//UTF-16 characters can have variable length, but the Core Foundation reference implementation //UTF-16 characters can have variable length, but the Core Foundation reference implementation
//assumes 2 byte characters, thus only covering the Basic Multilingual Plane //assumes 2 byte characters, thus only covering the Basic Multilingual Plane
@@ -313,9 +305,8 @@ namespace Claunia.PropertyList
case 0x7: case 0x7:
{ {
//UTF-8 string (v1.0 and later) //UTF-8 string (v1.0 and later)
int[] lengthAndOffset = ReadLengthAndOffset(bytes, objInfo, offset); ReadLengthAndOffset(bytes, objInfo, offset, out int strOffset, out int characters);
int strOffset = lengthAndOffset[1];
int characters = lengthAndOffset[0];
//UTF-8 characters can have variable length, so we need to calculate the byte length dynamically //UTF-8 characters can have variable length, so we need to calculate the byte length dynamically
//by reading the UTF-8 characters one by one //by reading the UTF-8 characters one by one
int length = CalculateUtf8StringLength(bytes, offset + strOffset, characters); int length = CalculateUtf8StringLength(bytes, offset + strOffset, characters);
@@ -330,9 +321,7 @@ namespace Claunia.PropertyList
case 0xA: case 0xA:
{ {
//Array //Array
int[] lengthAndOffset = ReadLengthAndOffset(bytes, objInfo, offset); ReadLengthAndOffset(bytes, objInfo, offset, out int length, out int arrayOffset);
int length = lengthAndOffset[0];
int arrayOffset = lengthAndOffset[1];
NSArray array = new NSArray(length); NSArray array = new NSArray(length);
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
@@ -346,9 +335,7 @@ namespace Claunia.PropertyList
case 0xB: case 0xB:
{ {
//Ordered set (v1.0 and later) //Ordered set (v1.0 and later)
int[] lengthAndOffset = ReadLengthAndOffset(bytes, objInfo, offset); ReadLengthAndOffset(bytes, objInfo, offset, out int length, out int contentOffset);
int length = lengthAndOffset[0];
int contentOffset = lengthAndOffset[1];
NSSet set = new NSSet(true); NSSet set = new NSSet(true);
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
@@ -361,9 +348,7 @@ namespace Claunia.PropertyList
case 0xC: case 0xC:
{ {
//Set (v1.0 and later) //Set (v1.0 and later)
int[] lengthAndOffset = ReadLengthAndOffset(bytes, objInfo, offset); ReadLengthAndOffset(bytes, objInfo, offset, out int length, out int contentOffset);
int length = lengthAndOffset[0];
int contentOffset = lengthAndOffset[1];
NSSet set = new NSSet(); NSSet set = new NSSet();
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
@@ -376,9 +361,7 @@ namespace Claunia.PropertyList
case 0xD: case 0xD:
{ {
//Dictionary //Dictionary
int[] lengthAndOffset = ReadLengthAndOffset(bytes, objInfo, offset); ReadLengthAndOffset(bytes, objInfo, offset, out int length, out int contentOffset);
int length = lengthAndOffset[0];
int contentOffset = lengthAndOffset[1];
//System.out.println("Parsing dictionary #"+obj); //System.out.println("Parsing dictionary #"+obj);
NSDictionary dict = new NSDictionary(); NSDictionary dict = new NSDictionary();
@@ -407,10 +390,10 @@ namespace Claunia.PropertyList
/// <returns>An array with the length two. First entry is the length, second entry the offset at which the content starts.</returns> /// <returns>An array with the length two. First entry is the length, second entry the offset at which the content starts.</returns>
/// <param name="objInfo">Object information byte.</param> /// <param name="objInfo">Object information byte.</param>
/// <param name="offset">Offset in the byte array at which the object is located.</param> /// <param name="offset">Offset in the byte array at which the object is located.</param>
int[] ReadLengthAndOffset(ReadOnlySpan<byte> bytes, int objInfo, int offset) void ReadLengthAndOffset(ReadOnlySpan<byte> bytes, int objInfo, int offset, out int lengthValue, out int offsetValue)
{ {
int lengthValue = objInfo; lengthValue = objInfo;
int offsetValue = 1; offsetValue = 1;
if (objInfo == 0xF) if (objInfo == 0xF)
{ {
int int_type = bytes[offset + 1]; int int_type = bytes[offset + 1];
@@ -437,7 +420,6 @@ namespace Claunia.PropertyList
lengthValue = (int)new System.Numerics.BigInteger(bigEBigInteger); lengthValue = (int)new System.Numerics.BigInteger(bigEBigInteger);
} }
} }
return new[] { lengthValue, offsetValue };
} }
/// <summary> /// <summary>