From a62b9cf7a3693ef99cddc2d0d1b2d80b89ab2e2e Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 4 Aug 2012 22:18:58 +0200 Subject: osd: free buffer allocated with av_malloc with av_free free() was used before, which could in theory lead to crashes if the OSD buffer was freed or resized. (Whether using free() actually works depends on what function libavutil's av_malloc() uses internally. On Linux, it seems to use memalign(), which uses free() as counterpart for deallocation, so the bug never triggered for me.) --- sub/sub.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sub') diff --git a/sub/sub.c b/sub/sub.c index cc0407ea1c..731bec3565 100644 --- a/sub/sub.c +++ b/sub/sub.c @@ -99,8 +99,8 @@ void osd_alloc_buf(mp_osd_obj_t* obj) len = obj->stride*(obj->bbox.y2-obj->bbox.y1); if (obj->allocatedallocated = len; - free(obj->bitmap_buffer); - free(obj->alpha_buffer); + av_free(obj->bitmap_buffer); + av_free(obj->alpha_buffer); obj->bitmap_buffer = av_malloc(len); obj->alpha_buffer = av_malloc(len); } @@ -211,8 +211,8 @@ void osd_free(struct osd_state *osd) mp_osd_obj_t* obj=vo_osd_list; while(obj){ mp_osd_obj_t* next=obj->next; - free(obj->alpha_buffer); - free(obj->bitmap_buffer); + av_free(obj->alpha_buffer); + av_free(obj->bitmap_buffer); free(obj); obj=next; } -- cgit v1.2.3