Added argument validations to ComparePackUri an ComparePartUri.
authorMarcos Henrich <marcos.henrich@xamarin.com>
Thu, 7 Aug 2014 08:10:53 +0000 (09:10 +0100)
committerMarcos Henrich <marcos.henrich@xamarin.com>
Thu, 7 Aug 2014 08:10:53 +0000 (09:10 +0100)
mcs/class/WindowsBase/System.IO.Packaging/PackUriHelper.cs

index d7b5e2e31ade2f900e24a9cc2af84cf247c23820..7ed424368cc42775157a8411587a9cfcbff69e01 100644 (file)
@@ -42,24 +42,28 @@ namespace System.IO.Packaging {
                
                public static int ComparePackUri (Uri firstPackUri, Uri secondPackUri)
                {
-                       // FIXME: Do i need to do validation that it is a pack:// uri?
                        if (firstPackUri == null)
                                return secondPackUri == null ? 0 : -1;
                        if (secondPackUri == null)
                                return 1;
 
+                       Check.PackUriIsValid (firstPackUri);
+                       Check.PackUriIsValid (secondPackUri);
+
                        // FIXME: What exactly is compared. Lets assume originalstring
                        return firstPackUri.OriginalString.CompareTo (secondPackUri.OriginalString);
                }
 
                public static int ComparePartUri (Uri firstPartUri, Uri secondPartUri)
                {
-                       // FIXME: Do i need to do validation that it is a part URI?
                        if (firstPartUri == null)
                                return secondPartUri == null ? 0 : -1;
                        if (secondPartUri == null)
                                return 1;
 
+                       Check.PartUriIsValid (firstPartUri);
+                       Check.PartUriIsValid (secondPartUri);
+
                        return firstPartUri.OriginalString.CompareTo (secondPartUri.OriginalString);
                }