RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_libmpv: don't steal pointer provided by the API user 

It won't be TA allocated and would fail on header check. Also
documentation doesn't mention that ownership is transfered to mpv, so it
is unexpected.

This will cause existing clients of this API leak this memory, but I
doubt anyone really used it in this broken state.

Fixes: #14633
This commit is contained in:
Kacper Michajłow 2024-08-04 21:51:25 +02:00
parent 25f441b740
commit 6f619d5ef4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/client-api-changes.rst
View File

@ -32,6 +32,10 @@ API changes
:: ::
--- mpv 0.39.0 ---
2.4 - mpv_render_param with the MPV_RENDER_PARAM_ICC_PROFILE argument no
longer has incorrect assumptions about memory allocation and can be
correctly used.
--- mpv 0.38.0 --- --- mpv 0.38.0 ---
2.3 - partially revert the changes from API version 1.27, remove libmpv as 2.3 - partially revert the changes from API version 1.27, remove libmpv as
the default VO and move it to the bottom of the auto-probing order. the default VO and move it to the bottom of the auto-probing order.

3
osdep/mac/libmpv_helper.swift
View File

@ -146,8 +146,7 @@ class LibmpvHelper {
guard let baseAddress = ptr.baseAddress, ptr.count > 0 else { return } guard let baseAddress = ptr.baseAddress, ptr.count > 0 else { return }
let u8Ptr = baseAddress.assumingMemoryBound(to: UInt8.self) let u8Ptr = baseAddress.assumingMemoryBound(to: UInt8.self)
let iccBstr = bstrdup(nil, bstr(start: u8Ptr, len: ptr.count)) var icc = mpv_byte_array(data: u8Ptr, size: ptr.count)
var icc = mpv_byte_array(data: iccBstr.start, size: iccBstr.len)
withUnsafeMutableBytes(of: &icc) { (ptr: UnsafeMutableRawBufferPointer) in withUnsafeMutableBytes(of: &icc) { (ptr: UnsafeMutableRawBufferPointer) in
let params = mpv_render_param(type: MPV_RENDER_PARAM_ICC_PROFILE, data: ptr.baseAddress) let params = mpv_render_param(type: MPV_RENDER_PARAM_ICC_PROFILE, data: ptr.baseAddress)
mpv_render_context_set_parameter(mpvRenderContext, params) mpv_render_context_set_parameter(mpvRenderContext, params)

2
video/out/gpu/libmpv_gpu.c
View File

@ -107,7 +107,7 @@ static int set_parameter(struct render_backend *ctx, mpv_render_param param)
switch (param.type) { switch (param.type) {
case MPV_RENDER_PARAM_ICC_PROFILE: { case MPV_RENDER_PARAM_ICC_PROFILE: {
mpv_byte_array *data = param.data; mpv_byte_array *data = param.data;
gl_video_set_icc_profile(p->renderer, (bstr){data->data, data->size}); gl_video_set_icc_profile(p->renderer, bstrdup(NULL, (bstr){data->data, data->size}));
return 0; return 0;
} }
case MPV_RENDER_PARAM_AMBIENT_LIGHT: { case MPV_RENDER_PARAM_AMBIENT_LIGHT: {