From 3b2ee2b5bfc0d68525fee936e51297a9b6c629f1 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Fri, 27 Feb 2015 12:20:32 -0500 Subject: [PATCH] drmSL: Fix neighbor lookup Commit e4a519635f75bde38aeb5b09f2ff4efbf73453e9: Tidy up compile warnings by cleaning up types. removed call to SLLocate which gutted the function of all functionality. This patch restores the original behavior, with an additional fix that zeros the update array in case SLLocate bails early. v2: zero the update array instead of checking the return value. SLLocate returns NULL both on failure and if the element is greater than everything in the list v3: Improve commit message Signed-off-by: Jan Vesely Acked-by: Emil Velikov --- xf86drmSL.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xf86drmSL.c b/xf86drmSL.c index acddb541..cf588ac9 100644 --- a/xf86drmSL.c +++ b/xf86drmSL.c @@ -264,12 +264,14 @@ int drmSLLookupNeighbors(void *l, unsigned long key, unsigned long *next_key, void **next_value) { SkipListPtr list = (SkipListPtr)l; - SLEntryPtr update[SL_MAX_LEVEL + 1]; + SLEntryPtr update[SL_MAX_LEVEL + 1] = {0}; int retcode = 0; + SLLocate(list, key, update); + *prev_key = *next_key = key; *prev_value = *next_value = NULL; - + if (update[0]) { *prev_key = update[0]->key; *prev_value = update[0]->value;