diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-04 12:21:27 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-04 12:31:09 +0100 |
| commit | 6f8b411b8a833cca6fce8888ce515db6413d57ca (patch) | |
| tree | aa886676f397282ba94a40198cc6ab8c960a7488 | |
| parent | 72a29aa74a1488269c2184300e573d060c49e232 (diff) | |
uxa: Preferred order for calloc is (count, size)
And assert that the allocation succeeds for good measure. A great big
dollop of graceful failure is missing...
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/i965_render.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/i965_render.c b/src/i965_render.c index 7bfbcbd8..75c99e24 100644 --- a/src/i965_render.c +++ b/src/i965_render.c @@ -2342,8 +2342,10 @@ void gen4_render_state_init(ScrnInfoPtr scrn) intel->surface_used = 0; - if (intel->gen4_render_state == NULL) - intel->gen4_render_state = calloc(sizeof(*render), 1); + if (intel->gen4_render_state == NULL) { + intel->gen4_render_state = calloc(1, sizeof(*render)); + assert(intel->gen4_render_state != NULL); + } if (INTEL_INFO(intel)->gen >= 60) return gen6_render_state_init(scrn); |