From 6a5b23824cc44885453cd69b1cc04bf49b817121 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Tue, 12 Oct 2010 15:32:37 +0200
Subject: [PATCH] [asp.net] HiddenFieldPageStatePersister must not attempt to
 deserialize an empty/null string

---
 .../System.Web.UI/HiddenFieldPageStatePersister.cs    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs b/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
index b66bffcb750..5c0ae028877 100644
--- a/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
+++ b/mcs/class/System.Web/System.Web.UI/HiddenFieldPageStatePersister.cs
@@ -53,11 +53,14 @@ namespace System.Web.UI
 				return;
 			}
 #endif
+			string rawViewState = Page.RawViewState;
 			IStateFormatter formatter = StateFormatter;
-			Pair pair = formatter.Deserialize (Page.RawViewState) as Pair;
-			if (pair != null) {
-				ViewState = pair.First;
-				ControlState = pair.Second;
+			if (!String.IsNullOrEmpty (rawViewState)) {
+				Pair pair = formatter.Deserialize (rawViewState) as Pair;
+				if (pair != null) {
+					ViewState = pair.First;
+					ControlState = pair.Second;
+				}
 			}
 		}
 
-- 
GitLab