From 1f7dadccd45863ebea8f60339f297ac551e89899 Mon Sep 17 00:00:00 2001
From: Vijaykumar koppad <vijaykumar.koppad@gmail.com>
Date: Tue, 26 Mar 2013 17:42:32 +0530
Subject: libglusterfs/dict: fix infinite loop in dict_keys_join()

	 - missing "pairs = next" caused infinite loop

Change-Id: I9171be5bec051de6095e135d616534ab49cd4797
BUG: 905871
Signed-off-by: Vijaykumar Koppad <vijaykumar.koppad@gmail.com>
Reviewed-on: http://review.gluster.org/4723
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
---
 libglusterfs/src/dict.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c
index a8cdeaf28..72dd7e7aa 100644
--- a/libglusterfs/src/dict.c
+++ b/libglusterfs/src/dict.c
@@ -1180,8 +1180,10 @@ dict_keys_join (void *value, int size, dict_t *dict,
         while (pairs) {
                 next = pairs->next;
 
-                if (filter_fn && filter_fn (pairs->key))
-                        continue;
+                if (filter_fn && filter_fn (pairs->key)){
+		    pairs = next;
+		    continue;
+		}
 
 		if (value && (size > len))
 			strncpy (value + len, pairs->key, size - len);
-- 
cgit