Skip to content
Permalink
Browse files

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.
  • Loading branch information
pulkomandy committed Nov 12, 2019
1 parent 50806ee commit 3b516e633b4a170ba54b6e96b069e89fa59b3dbc
Showing with 10 additions and 5 deletions.
  1. +10 −5 src/video/haiku/SDL_BWin.h
@@ -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,13 +180,17 @@ class SDL_BWin:public BDirectWindow
_connected = true;

case B_DIRECT_MODIFY:
if(_clips) {
free(_clips);
_clips = NULL;
if (info->clip_list_count > _num_clips)
{
if(_clips) {
free(_clips);
_clips = NULL;
}
}

_num_clips = info->clip_list_count;
_clips = (clipping_rect *)malloc(_num_clips*sizeof(clipping_rect));
if (_clips == NULL)
_clips = (clipping_rect *)malloc(_num_clips*sizeof(clipping_rect));
if(_clips) {
memcpy(_clips, info->clip_list,
_num_clips*sizeof(clipping_rect));
@@ -652,7 +657,7 @@ class SDL_BWin:public BDirectWindow
clipping_rect _bounds;
BLocker *_buffer_locker;
clipping_rect *_clips;
int32 _num_clips;
uint32 _num_clips;
int32 _bytes_per_px;
thread_id _draw_thread_id;

0 comments on commit 3b516e6

Please sign in to comment.