From 2d05ba2ca0af336ceae3167432d7df9df3366b74 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Thu, 8 Sep 2016 15:55:02 -0400 Subject: gbm: return appropriate error when queryImage() fails Change gbm_dri_bo_get_fd to check the return value of queryImage and return -1 (an invalid file descriptor) if an error occurs. Update the comment for gbm_bo_get_fd to return -1, since (apart from the above) we've already return -1 on error. Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Nicholas Bishop Reviewed-by: Eric Engestrom (v1) [Emil Velikov: Split from larger patch, polish coding style, cc stable] Signed-off-by: Emil Velikov --- src/gbm/main/gbm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gbm/main') diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c index 5a8e8b7b9f0..b9fb70d1293 100644 --- a/src/gbm/main/gbm.c +++ b/src/gbm/main/gbm.c @@ -204,7 +204,8 @@ gbm_bo_get_handle(struct gbm_bo *bo) * descriptor. * \param bo The buffer object - * \return Returns a file descriptor referring to the underlying buffer + * \return Returns a file descriptor referring to the underlying buffer or -1 + * if an error occurs. */ GBM_EXPORT int gbm_bo_get_fd(struct gbm_bo *bo) -- cgit v1.2.3