Module: Mesa Branch: master Commit: 69cc7d90f9f60d95cd570a4e87755a474554d41f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=69cc7d90f9f60d95cd570a4e87755a474554d41f
Author: Gwan-gyeong Mun <[email protected]> Date: Tue Nov 22 00:21:23 2016 +0900 util/disk_cache: close a previously opened handle in disk_cache_put (v2) We're missing the close() to the matching open(). CID 1373407 v2: Fixes from Emil Velikov's review Update the teardown in reverse order of the setup/init. Cc: "13.0" <[email protected]> Signed-off-by: Mun Gwan-gyeong <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Iago Toral Quiroga <[email protected]> (v1) --- src/util/disk_cache.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c index 4287878..80dc788 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c @@ -612,19 +612,18 @@ disk_cache_put(struct disk_cache *cache, p_atomic_add(cache->size, size); + done: + if (fd_final != -1) + close(fd_final); /* This close finally releases the flock, (now that the final dile * has been renamed into place and the size has been added). */ - close(fd); - fd = -1; - - done: + if (fd != -1) + close(fd); if (filename_tmp) ralloc_free(filename_tmp); if (filename) ralloc_free(filename); - if (fd != -1) - close(fd); } void * _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
