Merge pull request #15502 from jasonmalinowski/do-not-crash-with-bad-…

…serialized-data Correctly deal with bad upstream data being fetched from the settings store
dotnet · Dec 5, 2016 · 743ce3b · 743ce3b
2 parents fd9ab17 + c244596
commit 743ce3b
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/...VisualStudio/Core/Def/Implementation/Options/RoamingVisualStudioProfileOptionPersister.cs b/...VisualStudio/Core/Def/Implementation/Options/RoamingVisualStudioProfileOptionPersister.cs
@@ -132,9 +132,28 @@ public bool TryFetch(OptionKey optionKey, out object value)
                 }
                 else
                 {
-                    value = optionKey.Option.DefaultValue;
+                    value = null;
+                    return false;
                 }
             }
+            else if (optionKey.Option.Type == typeof(bool) && value is int intValue)
+            {
+                // TypeScript used to store some booleans as integers. We now handle them properly for legacy sync scenarios.
+                value = intValue != 0;
+                return true;
+            }
+            else if (optionKey.Option.Type == typeof(bool) && value is long longValue)
+            {
+                // TypeScript used to store some booleans as integers. We now handle them properly for legacy sync scenarios.
+                value = longValue != 0;
+                return true;
+            }
+            else if (value != null && optionKey.Option.Type != value.GetType())
+            {
+                // We got something back different than we expected, so fail to deserialize
+                value = null;
+                return false;
+            }
 
             return true;
         }
@@ -189,4 +208,4 @@ public bool TryPersist(OptionKey optionKey, object value)
             return true;
         }
     }
-}
+}