Sort unrelated grouping

neo-project · Jul 26, 2019 · 41ce918 · 41ce918
1 parent 50c51da
commit 41ce918
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/neo/IO/Helper.cs b/neo/IO/Helper.cs
@@ -92,17 +92,16 @@ public static byte[] ReadBytesWithGrouping(this BinaryReader reader)
  {
  using (MemoryStream ms = new MemoryStream())
  {
- int padding = 0;
+ int count;
  do
  {
  byte[] group = reader.ReadBytes(GroupingSizeInBytes);
- padding = reader.ReadByte();
- if (padding > GroupingSizeInBytes)
+ count = reader.ReadByte();
+ if (count > GroupingSizeInBytes)
  throw new FormatException();
- int count = GroupingSizeInBytes - padding;
  if (count > 0)
  ms.Write(group, 0, count);
- } while (padding == 0);
+ } while (count == GroupingSizeInBytes);
  return ms.ToArray();
  }
  }
@@ -200,7 +199,7 @@ public static void WriteBytesWithGrouping(this BinaryWriter writer, byte[] value
  while (remain >= GroupingSizeInBytes)
  {
  writer.Write(value, index, GroupingSizeInBytes);
- writer.Write((byte)0);
+ writer.Write((byte)GroupingSizeInBytes);
  index += GroupingSizeInBytes;
  remain -= GroupingSizeInBytes;
  }
@@ -209,7 +208,7 @@ public static void WriteBytesWithGrouping(this BinaryWriter writer, byte[] value
  int padding = GroupingSizeInBytes - remain;
  for (int i = 0; i < padding; i++)
  writer.Write((byte)0);
- writer.Write((byte)padding);
+ writer.Write((byte)remain);
  }
 
  public static void WriteFixedString(this BinaryWriter writer, string value, int length)

diff --git a/neo/SmartContract/InteropService.NEO.cs b/neo/SmartContract/InteropService.NEO.cs
@@ -353,7 +353,7 @@ private static bool Storage_Find(ApplicationEngine engine)
  while (remain >= 16)
  {
  ms.Write(prefix, index, 16);
- ms.WriteByte(0);
+ ms.WriteByte(16);
  index += 16;
  remain -= 16;
  }