mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Change QTFastStart to recover gracefully if it encounters an error during bitstring matching

Browse source 
This fixes issues with internal errors when trying to serve the video
This commit is contained in:
Mark Felder 2023-12-29 14:12:44 -05:00
parent 8ac4458630
commit 50edef5bc1
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/qtfaststart.fix Normal file
View file

@ -0,0 +1 @@
MediaProxy Preview failures prevented when encountering certain video files

5
lib/pleroma/helpers/qt_fast_start.ex
View file

@ -40,6 +40,7 @@ defmodule Pleroma.Helpers.QtFastStart do
got_mdat, got_mdat,
acc acc
) do ) do
try do
full_size = (size - 8) * 8 full_size = (size - 8) * 8
<<data::bits-size(full_size), rest::bits>> = rest <<data::bits-size(full_size), rest::bits>> = rest
@ -50,6 +51,10 @@ defmodule Pleroma.Helpers.QtFastStart do
] ]
fix(rest, pos + size, got_moov || fourcc == "moov", got_mdat || fourcc == "mdat", acc) fix(rest, pos + size, got_moov || fourcc == "moov", got_mdat || fourcc == "mdat", acc)
rescue
_ ->
:abort
end
end end
defp fix(<<>>, _pos, _, _, acc) do defp fix(<<>>, _pos, _, _, acc) do