jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix obs_data_item_setdata

Browse Source 
It would try to move data from the old pointer even if the pointer was
changed via realloc, which would cause it to copy data from freed
memory.  Instead, just get the position of the data and call memmove to
move it up.
This commit is contained in:
jp9000 2014-08-22 15:39:29 -07:00
parent fe13f59e3d
commit 1bbdcc10d7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libobs/obs-data.c
View File

@ -377,7 +377,8 @@ static inline void obs_data_item_setdata(
return;
struct obs_data_item *item = *p_item;
void *old_non_user_data = get_default_data_ptr(item);
ptrdiff_t old_default_data_pos =
(uint8_t*)get_default_data_ptr(item) - (uint8_t*)item;
item_data_release(item);
item->data_size = size;
@ -387,8 +388,8 @@ static inline void obs_data_item_setdata(
item = obs_data_item_ensure_capacity(item);
if (item->default_size || item->autoselect_size)
move_data(*p_item, old_non_user_data, item,
get_default_data_ptr(item),
memmove(get_default_data_ptr(item),
(uint8_t*)item + old_default_data_pos,
item->default_len + item->autoselect_size);
if (size) {