summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaoyu Qiu <timothyqiu32@gmail.com>2022-02-15 13:04:37 +0800
committerHaoyu Qiu <timothyqiu32@gmail.com>2022-02-15 15:11:05 +0800
commitb4ffaebb8754d78f64ae3d8aae3439e7927bb409 (patch)
tree4556df6cbe62c6045bc46a41d60274fa073b7228
parentd02db6306ebcb57296dece3e8d990ae188b39aad (diff)
Fix infinite recursion when seeking Ogg Vorbis file
-rw-r--r--modules/ogg/ogg_packet_sequence.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/ogg/ogg_packet_sequence.cpp b/modules/ogg/ogg_packet_sequence.cpp
index 65058f088e..da52ecfdd5 100644
--- a/modules/ogg/ogg_packet_sequence.cpp
+++ b/modules/ogg/ogg_packet_sequence.cpp
@@ -162,6 +162,7 @@ bool OGGPacketSequencePlayback::next_ogg_packet(ogg_packet **p_packet) const {
}
uint32_t OGGPacketSequencePlayback::seek_page_internal(int64_t granule, uint32_t after_page_inclusive, uint32_t before_page_inclusive) {
+ // FIXME: This function needs better corner case handling.
if (before_page_inclusive == after_page_inclusive) {
return before_page_inclusive;
}
@@ -169,7 +170,8 @@ uint32_t OGGPacketSequencePlayback::seek_page_internal(int64_t granule, uint32_t
// Complicating the bisection search algorithm, the middle page might not have a packet that ends on it,
// which means it might not have a correct granule position. Find a nearby page that does have a packet ending on it.
uint32_t bisection_page = -1;
- for (uint32_t test_page = actual_middle_page; test_page <= before_page_inclusive; test_page++) {
+ // Don't include before_page_inclusive because that always succeeds and will cause infinite recursion later.
+ for (uint32_t test_page = actual_middle_page; test_page < before_page_inclusive; test_page++) {
if (ogg_packet_sequence->page_data[test_page].size() > 0) {
bisection_page = test_page;
break;