asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #73958 from davicr/stream_change_crash

Browse source 
Fix crash when changing VideoStreamPlayer.Stream
This commit is contained in:
Rémi Verschelde 2023-02-26 14:25:44 +01:00
commit 3300b40fe6
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/theora/video_stream_theora.cpp
View file

@ -251,8 +251,12 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
/* we're expecting more header packets. */
while ((theora_p && theora_p < 3) || (vorbis_p && vorbis_p < 3)) {
int ret = 0;
/* look for further theora headers */
int ret = ogg_stream_packetout(&to, &op);
if (theora_p && theora_p < 3) {
ret = ogg_stream_packetout(&to, &op);
}
while (theora_p && theora_p < 3 && ret) {
if (ret < 0) {
fprintf(stderr, "Error parsing Theora stream headers; corrupt stream?\n");
@ -269,7 +273,9 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
}
/* look for more vorbis header packets */
ret = ogg_stream_packetout(&vo, &op);
if (vorbis_p && vorbis_p < 3) {
ret = ogg_stream_packetout(&vo, &op);
}
while (vorbis_p && vorbis_p < 3 && ret) {
if (ret < 0) {
fprintf(stderr, "Error parsing Vorbis stream headers; corrupt stream?\n");