From: CryptoManiac <balthazar@yandex.ru>
Date: Sat, 15 Aug 2015 22:35:28 +0000 (+0300)
Subject: Use LongCount
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=3525ae9b9a1ab27187a3f83ba5d90836ab49dc0e;p=NovacoinLibrary.git

Use LongCount

Though it's unlikely to be harmful, integer type is not sufficient for
handling maximum script length
---

diff --git a/Novacoin/CScript.cs b/Novacoin/CScript.cs
index ca8f96d..565fda9 100644
--- a/Novacoin/CScript.cs
+++ b/Novacoin/CScript.cs
@@ -101,35 +101,37 @@ namespace Novacoin
         /// <param name="dataBytes">List of data bytes</param>
         public void PushData(IList<byte> dataBytes)
         {
-            if (dataBytes.Count < (int)opcodetype.OP_PUSHDATA1)
+            long nCount = dataBytes.LongCount();
+
+            if (nCount < (int)opcodetype.OP_PUSHDATA1)
             {
                 // OP_0 and OP_FALSE
-                codeBytes.Add((byte)dataBytes.Count);
+                codeBytes.Add((byte)nCount);
             }
-            else if (dataBytes.Count < 0xff)
+            else if (nCount < 0xff)
             {
                 // OP_PUSHDATA1 0x01 [0x5a]
                 codeBytes.Add((byte)opcodetype.OP_PUSHDATA1);
-                codeBytes.Add((byte)dataBytes.Count);
+                codeBytes.Add((byte)nCount);
             }
-            else if (dataBytes.Count < 0xffff)
+            else if (nCount < 0xffff)
             {
                 // OP_PUSHDATA1 0x00 0x01 [0x5a]
                 codeBytes.Add((byte)opcodetype.OP_PUSHDATA2);
 
-                byte[] szBytes = BitConverter.GetBytes((short)dataBytes.Count);
+                byte[] szBytes = BitConverter.GetBytes((ushort)nCount);
                 if (BitConverter.IsLittleEndian)
                 {
                     Array.Reverse(szBytes);
                 }
                 codeBytes.AddRange(szBytes);
             }
-            else if ((uint)dataBytes.Count < 0xffffffff)
+            else if (nCount < 0xffffffff)
             {
                 // OP_PUSHDATA1 0x00 0x00 0x00 0x01 [0x5a]
                 codeBytes.Add((byte)opcodetype.OP_PUSHDATA4);
 
-                byte[] szBytes = BitConverter.GetBytes((uint)dataBytes.Count);
+                byte[] szBytes = BitConverter.GetBytes((uint)nCount);
                 if (BitConverter.IsLittleEndian)
                 {
                     Array.Reverse(szBytes);
@@ -228,7 +230,7 @@ namespace Novacoin
                 if (opcode == opcodetype.OP_PUSHDATA2 && data.Length <= 0xFF)
                     // Could have used an OP_PUSHDATA1.
                     return false;
-                if (opcode == opcodetype.OP_PUSHDATA4 && data.Length <= 0xFFFF)
+                if (opcode == opcodetype.OP_PUSHDATA4 && data.LongLength <= 0xFFFF)
                     // Could have used an OP_PUSHDATA2.
                     return false;
             }