gallium: Fix leak of the merged driconf options.

Fixes: 8a05d6ffc6 ("driconf: Make the driver's declarations be structs instead of XML.")
Reviewed-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7695>
(cherry picked from commit 0626e3a950)
This commit is contained in:
Eric Anholt 2020-11-17 16:37:41 -08:00 committed by Dylan Baker
parent 531b15c22a
commit 0ee24d08fa
2 changed files with 2 additions and 1 deletions

View file

@ -67,7 +67,7 @@
"description": "gallium: Fix leak of the merged driconf options.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "8a05d6ffc65d0fd0e0a52fe84a174d4ca63e5521"
},

View file

@ -120,6 +120,7 @@ pipe_loader_load_options(struct pipe_loader_device *dev)
driParseOptionInfo(&dev->option_info, merged_driconf, merged_count);
driParseConfigFiles(&dev->option_cache, &dev->option_info, 0,
dev->driver_name, NULL, NULL, 0, NULL, 0);
free((void *)merged_driconf);
}
char *