Tyler Hicks b502110dcf libapparmor: Fix variable name overlap in merge() macro ... The calling function and the merge() macro both make use of a variable named "i" but this causes problems when merging. The aa_policy_cache.sh test script experiences "bad file descriptor" failures due to the merged list containing invalid fd values (-1). Fix this by renaming merge()'s index variables from i and j to y and z to hopefully prevent future overlap. The better fix here would be to convert merge() to a function but that's a more intrusive change and I don't have an easy way to test the overlay feature. PR: https://gitlab.com/apparmor/apparmor/merge_requests/348 (cherry picked from commit d7ac07afc4) Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Signed-off-by: John Johansen <john.johansen@canonical.com>		2019-03-12 23:22:26 -07:00
..
libapparmor	libapparmor: Fix variable name overlap in merge() macro	2019-03-12 23:22:26 -07:00