From 493ba5dd4c14994bbc32630feae63ae7bd7d0ed8 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 27 Apr 2021 13:19:31 +0100
Subject: [PATCH] Fix extents creation from a list of extents to prevent
 overlapping extents to be added.

---
 Extents/ExtentsByte.cs   |  9 ++++++++-
 Extents/ExtentsInt.cs    |  9 ++++++++-
 Extents/ExtentsLong.cs   |  9 ++++++++-
 Extents/ExtentsSByte.cs  | 13 ++++++++++---
 Extents/ExtentsShort.cs  | 13 ++++++++++---
 Extents/ExtentsUInt.cs   |  9 ++++++++-
 Extents/ExtentsULong.cs  | 13 ++++++++++---
 Extents/ExtentsUShort.cs |  9 ++++++++-
 8 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/Extents/ExtentsByte.cs b/Extents/ExtentsByte.cs
index f5a3c883f..4ecdc3dba 100644
--- a/Extents/ExtentsByte.cs
+++ b/Extents/ExtentsByte.cs
@@ -52,7 +52,14 @@ namespace Aaru.CommonTypes.Extents
 
         /// <summary>Initializes extents with an specific list</summary>
         /// <param name="list">List of extents as tuples "start, end"</param>
-        public ExtentsByte(IEnumerable<Tuple<byte, byte>> list) => _backend = list.OrderBy(t => t.Item1).ToList();
+        public ExtentsByte(IEnumerable<Tuple<byte, byte>> list)
+        {
+            _backend = new List<Tuple<byte, byte>>();
+
+            // This ensure no overlapping extents are added on creation
+            foreach(Tuple<byte, byte> t in list)
+                Add(t.Item1, t.Item2);
+        }
 
         /// <summary>Gets a count of how many extents are stored</summary>
         public int Count => _backend.Count;
diff --git a/Extents/ExtentsInt.cs b/Extents/ExtentsInt.cs
index 78dba695d..66c12b035 100644
--- a/Extents/ExtentsInt.cs
+++ b/Extents/ExtentsInt.cs
@@ -52,7 +52,14 @@ namespace Aaru.CommonTypes.Extents
 
         /// <summary>Initializes extents with an specific list</summary>
         /// <param name="list">List of extents as tuples "start, end"</param>
-        public ExtentsInt(IEnumerable<Tuple<int, int>> list) => _backend = list.OrderBy(t => t.Item1).ToList();
+        public ExtentsInt(IEnumerable<Tuple<int, int>> list)
+        {
+            _backend = new List<Tuple<int, int>>();
+
+            // This ensure no overlapping extents are added on creation
+            foreach(Tuple<int, int> t in list)
+                Add(t.Item1, t.Item2);
+        }
 
         /// <summary>Gets a count of how many extents are stored</summary>
         public int Count => _backend.Count;
diff --git a/Extents/ExtentsLong.cs b/Extents/ExtentsLong.cs
index 606b96508..eb1e351cc 100644
--- a/Extents/ExtentsLong.cs
+++ b/Extents/ExtentsLong.cs
@@ -52,7 +52,14 @@ namespace Aaru.CommonTypes.Extents
 
         /// <summary>Initializes extents with an specific list</summary>
         /// <param name="list">List of extents as tuples "start, end"</param>
-        public ExtentsLong(IEnumerable<Tuple<long, long>> list) => _backend = list.OrderBy(t => t.Item1).ToList();
+        public ExtentsLong(IEnumerable<Tuple<long, long>> list)
+        {
+            _backend = new List<Tuple<long, long>>();
+
+            // This ensure no overlapping extents are added on creation
+            foreach(Tuple<long, long> t in list)
+                Add(t.Item1, t.Item2);
+        }
 
         /// <summary>Gets a count of how many extents are stored</summary>
         public int Count => _backend.Count;
diff --git a/Extents/ExtentsSByte.cs b/Extents/ExtentsSByte.cs
index faffcc271..c7a6d0ba2 100644
--- a/Extents/ExtentsSByte.cs
+++ b/Extents/ExtentsSByte.cs
@@ -52,7 +52,14 @@ namespace Aaru.CommonTypes.Extents
 
         /// <summary>Initializes extents with an specific list</summary>
         /// <param name="list">List of extents as tuples "start, end"</param>
-        public ExtentsSByte(IEnumerable<Tuple<sbyte, sbyte>> list) => _backend = list.OrderBy(t => t.Item1).ToList();
+        public ExtentsSByte(IEnumerable<Tuple<sbyte, sbyte>> list)
+        {
+            _backend = new List<Tuple<sbyte, sbyte>>();
+
+            // This ensure no overlapping extents are added on creation
+            foreach(Tuple<sbyte, sbyte> t in list)
+                Add(t.Item1, t.Item2);
+        }
 
         /// <summary>Gets a count of how many extents are stored</summary>
         public int Count => _backend.Count;
@@ -234,8 +241,8 @@ namespace Aaru.CommonTypes.Extents
         {
             start = 0;
 
-            foreach(Tuple<sbyte, sbyte> extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)
-            )
+            foreach(Tuple<sbyte, sbyte> extent in
+                _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
             {
                 start = extent.Item1;
 
diff --git a/Extents/ExtentsShort.cs b/Extents/ExtentsShort.cs
index b80f0f846..360ca96ef 100644
--- a/Extents/ExtentsShort.cs
+++ b/Extents/ExtentsShort.cs
@@ -52,7 +52,14 @@ namespace Aaru.CommonTypes.Extents
 
         /// <summary>Initializes extents with an specific list</summary>
         /// <param name="list">List of extents as tuples "start, end"</param>
-        public ExtentsShort(IEnumerable<Tuple<short, short>> list) => _backend = list.OrderBy(t => t.Item1).ToList();
+        public ExtentsShort(IEnumerable<Tuple<short, short>> list)
+        {
+            _backend = new List<Tuple<short, short>>();
+
+            // This ensure no overlapping extents are added on creation
+            foreach(Tuple<short, short> t in list)
+                Add(t.Item1, t.Item2);
+        }
 
         /// <summary>Gets a count of how many extents are stored</summary>
         public int Count => _backend.Count;
@@ -234,8 +241,8 @@ namespace Aaru.CommonTypes.Extents
         {
             start = 0;
 
-            foreach(Tuple<short, short> extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)
-            )
+            foreach(Tuple<short, short> extent in
+                _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
             {
                 start = extent.Item1;
 
diff --git a/Extents/ExtentsUInt.cs b/Extents/ExtentsUInt.cs
index cc13a00b6..c70167fb4 100644
--- a/Extents/ExtentsUInt.cs
+++ b/Extents/ExtentsUInt.cs
@@ -52,7 +52,14 @@ namespace Aaru.CommonTypes.Extents
 
         /// <summary>Initializes extents with an specific list</summary>
         /// <param name="list">List of extents as tuples "start, end"</param>
-        public ExtentsUInt(IEnumerable<Tuple<uint, uint>> list) => _backend = list.OrderBy(t => t.Item1).ToList();
+        public ExtentsUInt(IEnumerable<Tuple<uint, uint>> list)
+        {
+            _backend = new List<Tuple<uint, uint>>();
+
+            // This ensure no overlapping extents are added on creation
+            foreach(Tuple<uint, uint> t in list)
+                Add(t.Item1, t.Item2);
+        }
 
         /// <summary>Gets a count of how many extents are stored</summary>
         public int Count => _backend.Count;
diff --git a/Extents/ExtentsULong.cs b/Extents/ExtentsULong.cs
index 8b726eec0..cf38227dc 100644
--- a/Extents/ExtentsULong.cs
+++ b/Extents/ExtentsULong.cs
@@ -52,7 +52,14 @@ namespace Aaru.CommonTypes.Extents
 
         /// <summary>Initializes extents with an specific list</summary>
         /// <param name="list">List of extents as tuples "start, end"</param>
-        public ExtentsULong(IEnumerable<Tuple<ulong, ulong>> list) => _backend = list.OrderBy(t => t.Item1).ToList();
+        public ExtentsULong(IEnumerable<Tuple<ulong, ulong>> list)
+        {
+            _backend = new List<Tuple<ulong, ulong>>();
+
+            // This ensure no overlapping extents are added on creation
+            foreach(Tuple<ulong, ulong> t in list)
+                Add(t.Item1, t.Item2);
+        }
 
         /// <summary>Gets a count of how many extents are stored</summary>
         public int Count => _backend.Count;
@@ -234,8 +241,8 @@ namespace Aaru.CommonTypes.Extents
         {
             start = 0;
 
-            foreach(Tuple<ulong, ulong> extent in _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2)
-            )
+            foreach(Tuple<ulong, ulong> extent in
+                _backend.Where(extent => item >= extent.Item1 && item <= extent.Item2))
             {
                 start = extent.Item1;
 
diff --git a/Extents/ExtentsUShort.cs b/Extents/ExtentsUShort.cs
index e6d663da3..89e128155 100644
--- a/Extents/ExtentsUShort.cs
+++ b/Extents/ExtentsUShort.cs
@@ -52,7 +52,14 @@ namespace Aaru.CommonTypes.Extents
 
         /// <summary>Initializes extents with an specific list</summary>
         /// <param name="list">List of extents as tuples "start, end"</param>
-        public ExtentsUShort(IEnumerable<Tuple<ushort, ushort>> list) => _backend = list.OrderBy(t => t.Item1).ToList();
+        public ExtentsUShort(IEnumerable<Tuple<ushort, ushort>> list)
+        {
+            _backend = new List<Tuple<ushort, ushort>>();
+
+            // This ensure no overlapping extents are added on creation
+            foreach(Tuple<ushort, ushort> t in list)
+                Add(t.Item1, t.Item2);
+        }
 
         /// <summary>Gets a count of how many extents are stored</summary>
         public int Count => _backend.Count;