Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recover from i830_dri2_add_frame_event out-of-memory condition 

If adding either the frame or client resources fails, we need to clean
up afterwards properly.

First, add_frame_event needs to internally clean up after itself by
undoing any partial execution. Second, the callers need to look at the
return value and free the swap/flip info structure when necessary.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Keith Packard 2011-03-24 11:06:57 -07:00
parent ec133abc4b
commit 7ccbec801e
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/intel_dri.c
View File

@ -625,8 +625,10 @@ i830_dri2_add_frame_event(DRI2FrameEventPtr frame_event)
if (!AddResource(frame_event->client_id, frame_event_client_type, frame_event))
return FALSE;
if (!AddResource(frame_event->drawable_id, frame_event_drawable_type, frame_event))
if (!AddResource(frame_event->drawable_id, frame_event_drawable_type, frame_event)) {
FreeResourceByType(frame_event->client_id, frame_event_client_type, TRUE);
return FALSE;
}
return TRUE;
}
@ -705,7 +707,10 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
flip_info->event_data = data;
flip_info->frame = target_msc;
i830_dri2_add_frame_event(flip_info);
if (!i830_dri2_add_frame_event(flip_info)) {
free(flip_info);
return FALSE;
}
/* Page flip the full screen buffer */
back_priv = back->driverPrivate;
@ -955,11 +960,16 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
swap_info->event_data = data;
swap_info->front = front;
swap_info->back = back;
if (!i830_dri2_add_frame_event(swap_info)) {
free(swap_info);
swap_info = NULL;
goto blit_fallback;
}
I830DRI2ReferenceBuffer(front);
I830DRI2ReferenceBuffer(back);
i830_dri2_add_frame_event(swap_info);
/* Get current count */
vbl.request.type = DRM_VBLANK_RELATIVE;
if (pipe > 0)