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

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

View file

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

View file

@ -40,16 +40,21 @@ defmodule Pleroma.Helpers.QtFastStart do
got_mdat, got_mdat,
acc acc
) do ) do
full_size = (size - 8) * 8 try do
<<data::bits-size(full_size), rest::bits>> = rest full_size = (size - 8) * 8
<<data::bits-size(full_size), rest::bits>> = rest
acc = [ acc = [
{fourcc, pos, pos + size, size, {fourcc, pos, pos + size, size,
<<size::integer-big-size(32), fourcc::bits-size(32), data::bits>>} <<size::integer-big-size(32), fourcc::bits-size(32), data::bits>>}
| acc | acc
] ]
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