mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2024-12-25 09:17:12 +01:00
haiku: Fix crash when opening window.
- _num_clips was not set in constructor, so a NULL _clips could be mistakenly dereferenced. - As _clips is accessible outside the class, it is not a good idea to free/reallocate it. Try to limit this by reallocating only when it needs to grow. Partially fixes Bugzilla #4442.
This commit is contained in:
parent
50806eeea2
commit
3b516e633b
@ -86,6 +86,7 @@ class SDL_BWin:public BDirectWindow
|
||||
_buffer_locker = new BLocker();
|
||||
_bitmap = NULL;
|
||||
_clips = NULL;
|
||||
_num_clips = 0;
|
||||
|
||||
#ifdef DRAWTHREAD
|
||||
_draw_thread_id = spawn_thread(HAIKU_DrawThread, "drawing_thread",
|
||||
@ -179,12 +180,16 @@ class SDL_BWin:public BDirectWindow
|
||||
_connected = true;
|
||||
|
||||
case B_DIRECT_MODIFY:
|
||||
if (info->clip_list_count > _num_clips)
|
||||
{
|
||||
if(_clips) {
|
||||
free(_clips);
|
||||
_clips = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
_num_clips = info->clip_list_count;
|
||||
if (_clips == NULL)
|
||||
_clips = (clipping_rect *)malloc(_num_clips*sizeof(clipping_rect));
|
||||
if(_clips) {
|
||||
memcpy(_clips, info->clip_list,
|
||||
@ -652,7 +657,7 @@ private:
|
||||
clipping_rect _bounds;
|
||||
BLocker *_buffer_locker;
|
||||
clipping_rect *_clips;
|
||||
int32 _num_clips;
|
||||
uint32 _num_clips;
|
||||
int32 _bytes_per_px;
|
||||
thread_id _draw_thread_id;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user