[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: demux: adaptive: check the next iterator against the vector end

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
70b80399 by Steve Lhomme at 2026-08-15T13:42:54+00:00
demux: adaptive: check the next iterator against the vector end

The original test was always true in the loop. We need to to check the
iterator we are going to dereference.

Fixes #29801

(cherry picked from commit 4bdf6021142884b36d135a6837fe6972db4905a9)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
23aa6c63 by Steve Lhomme at 2026-08-15T13:42:54+00:00
demux: adaptive: only use the "t" attributes if they exist

It might not be the case as seen in the code below.

(cherry picked from commit 8c34846dc494cb821c79fcbdaa56f363dc2a563a)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


1 changed file:

- modules/demux/smooth/playlist/SmoothParser.cpp


Changes:

=====================================
modules/demux/smooth/playlist/SmoothParser.cpp
=====================================
@@ -91,11 +91,11 @@ static SegmentTimeline *createTimeline(Node *streamIndexNode)
                 cur.duration = Integer<uint64_t>(chunk->getAttributeValue("d"));
                 b_cur_is_repeat &= (cur.duration == prev.duration);
             }
-            else
+            else if((it + 1) != chunks.end())
             {
-                if(it != chunks.end())
+                const Node *nextchunk = *(it + 1);
+                if (nextchunk->hasAttribute("t") && chunk->hasAttribute("t"))
                 {
-                    const Node *nextchunk = *(it + 1);
                     cur.duration = Integer<uint64_t>(nextchunk->getAttributeValue("t"))
                                  - Integer<uint64_t>(chunk->getAttributeValue("t"));
                     b_cur_is_repeat &= (cur.duration == prev.duration);



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/af406e87b3b0ad7f034dff2b8ccf376742c80555...23aa6c634c4a62bc6ddc77b1cad5a825f51b19d6

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/af406e87b3b0ad7f034dff2b8ccf376742c80555...23aa6c634c4a62bc6ddc77b1cad5a825f51b19d6
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help