From: <ic...@ke...> - 2010-01-06 16:55:25
|
xf86drmMode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit e6c136ca7a4c54457b48be1aec2be024b3e4a28d Author: Chris Wilson <ch...@ch...> Date: Wed Jan 6 16:53:33 2010 +0000 modes: Fix previous commit for potential legal NULLs If the count is 0, then the malloc is permitted to return NULL, so don't throw an error in that case. Signed-off-by: Chris Wilson <ch...@ch...> diff --git a/xf86drmMode.c b/xf86drmMode.c index 44ef05b..cfdee4a 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -206,7 +206,11 @@ retry: r->crtcs = drmAllocCpy(U642VOID(res.crtc_id_ptr), res.count_crtcs, sizeof(uint32_t)); r->connectors = drmAllocCpy(U642VOID(res.connector_id_ptr), res.count_connectors, sizeof(uint32_t)); r->encoders = drmAllocCpy(U642VOID(res.encoder_id_ptr), res.count_encoders, sizeof(uint32_t)); - if (!r->fbs || !r->crtcs || !r->connectors || !r->encoders) { + if ((res.count_fbs && !r->fbs) || + (res.count_crtcs && !r->crtcs) || + (res.count_connectors && !r->connectors) || + (res.count_encoders && !r->encoders)) + { drmFree(r->fbs); drmFree(r->crtcs); drmFree(r->connectors); |