Merge pull request #1 from google/beta-3

Beta 3

1 files changed, 18 insertions, 0 deletions

diff --git a/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs b/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
index 01d55395..eeb0f13a 100644
--- a/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
+++ b/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
@@ -30,6 +30,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #endregion

 

+using System;

 using System.IO;

 

 namespace Google.Protobuf

@@ -45,6 +46,11 @@ namespace Google.Protobuf
         {

         }

 

+        internal InvalidProtocolBufferException(string message, Exception innerException)

+            : base(message, innerException)

+        {

+        }

+

         internal static InvalidProtocolBufferException MoreDataAvailable()

         {

             return new InvalidProtocolBufferException(

@@ -82,6 +88,11 @@ namespace Google.Protobuf
                 "Protocol message contained an invalid tag (zero).");

         }

 

+        internal static InvalidProtocolBufferException InvalidBase64(Exception innerException)

+        {

+            return new InvalidProtocolBufferException("Invalid base64 data", innerException);

+        }

+

         internal static InvalidProtocolBufferException InvalidEndTag()

         {

             return new InvalidProtocolBufferException(

@@ -95,6 +106,13 @@ namespace Google.Protobuf
                 "Use CodedInputStream.SetRecursionLimit() to increase the depth limit.");

         }

 

+        internal static InvalidProtocolBufferException JsonRecursionLimitExceeded()

+        {

+            return new InvalidProtocolBufferException(

+                "Protocol message had too many levels of nesting.  May be malicious.  " +

+                "Use JsonParser.Settings to increase the depth limit.");

+        }

+

         internal static InvalidProtocolBufferException SizeLimitExceeded()

         {

             return new InvalidProtocolBufferException(