[Intel-gfx] [PATCH i-g-t v1 1/6] lib/igt_kms: Check memory allocations for failures
Robert Foss
robert.foss at collabora.com
Thu Jan 19 16:35:01 UTC 2017
Add missing descriptive igt_assert_t calls to calloc'd memory.
Signed-off-by: Robert Foss <robert.foss at collabora.com>
---
lib/igt_kms.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 2c5a6e89..8c10568a 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1107,6 +1107,7 @@ void kmstest_edid_add_3d(const unsigned char *edid, size_t length,
*new_length = length + 128;
new_edid = calloc(*new_length, sizeof(char));
+ igt_assert_f(new_edid, "Failed to allocate %zu bytes for edid\n", sizeof(new_length));
memcpy(new_edid, edid, length);
*new_edid_ptr = new_edid;
@@ -1506,6 +1507,7 @@ void igt_display_init(igt_display_t *display, int drm_fd)
*/
display->n_pipes = resources->count_crtcs;
display->pipes = calloc(sizeof(igt_pipe_t), display->n_pipes);
+ igt_assert_f(display->pipes, "Failed to allocate memory for %d pipes\n", display->n_pipes);
drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
is_atomic = drmSetClientCap(drm_fd, DRM_CLIENT_CAP_ATOMIC, 1);
@@ -1650,7 +1652,7 @@ void igt_display_init(igt_display_t *display, int drm_fd)
*/
display->n_outputs = resources->count_connectors;
display->outputs = calloc(display->n_outputs, sizeof(igt_output_t));
- igt_assert(display->outputs);
+ igt_assert_f(display->outputs, "Failed to allocate memory for %d outputs\n", display->n_outputs);
for (i = 0; i < display->n_outputs; i++) {
igt_output_t *output = &display->outputs[i];
--
2.11.0
More information about the Intel-gfx
mailing list