moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'qtfaststart-fix' into 'develop' 

Fix MediaProxy crashing on some videos

See merge request pleroma/pleroma!4024
This commit is contained in:
feld 2024-01-13 04:35:32 +00:00
parent d4b889783c 50edef5bc1
commit 9cc46c5538
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 @@ defp fix(
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 @@ defp fix(
] ]
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