[tests] Expect result from list::insert

Haivision · Jun 19, 2020 · 0451d9a · 0451d9a
1 parent f923683
commit 0451d9a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/srtcore/list.cpp b/srtcore/list.cpp
@@ -122,6 +122,17 @@ int CSndLossList::insert(int32_t seqno1, int32_t seqno2)
     const int offset  = CSeqNo::seqoff(m_caSeq[m_iHead].seqstart, seqno1);
     int       loc     = (m_iHead + offset + m_iSize) % m_iSize;
 
+    if (loc < 0)
+    {
+        // The size of the CSndLossList should be at least the size of the flow window.
+        // It means that all the packets sender has sent should fit within m_iSize.
+        // If the new loss does not fit, there is some error.
+        LOGC(mglog.Error, log << "IPE: New loss record is too old. Ignoring. "
+            << "First loss seqno " << m_caSeq[m_iHead].seqstart
+            << ", insert seqno " << seqno1 << ":" << seqno2);
+        return 0;
+    }
+
     if (offset < 0)
     {
         insertHead(loc, seqno1, seqno2);
@@ -349,6 +360,7 @@ int32_t CSndLossList::popLostSeq()
 
 void CSndLossList::insertHead(int pos, int32_t seqno1, int32_t seqno2)
 {
+    SRT_ASSERT(pos >= 0);
     m_caSeq[pos].seqstart = seqno1;
     SRT_ASSERT(m_caSeq[pos].seqend == SRT_SEQNO_NONE);
     if (seqno2 != seqno1)

diff --git a/srtcore/list.h b/srtcore/list.h
@@ -92,7 +92,7 @@ class CSndLossList
    struct Seq
    {
        int32_t seqstart;                // sequence number starts
-       int32_t seqend;                  // seqnence number ends
+       int32_t seqend;                  // sequence number ends
        int inext;                       // index of the next node in the list
    }* m_caSeq;
 

diff --git a/test/test_list.cpp b/test/test_list.cpp
@@ -449,7 +449,7 @@ TEST_F(CSndLossListTest, InsertHeadOverlap02)
     CheckEmptyArray();
 }
 
-TEST_F(CSndLossListTest, DISABLED_InsertHeadNegativeOffset01)
+TEST_F(CSndLossListTest, InsertHeadNegativeOffset01)
 {
     EXPECT_EQ(m_lossList->insert(10000000, 10000000), 1);
     EXPECT_EQ(m_lossList->insert(10000001, 10000001), 1);