From 158e51c17c0f569a1c107fa8747cf8d3fdb76b6d Mon Sep 17 00:00:00 2001
From: Vijaykumar Koppad <vkoppad@redhat.com>
Date: Wed, 27 Mar 2013 14:14:41 +0530
Subject: libglusterfs/dict: fix infinite loop in dict_keys_join()

         - missing "pairs = next" caused infinite loop

Change-Id: I3edc4f50473f7498815c73e1066167392718fddf
BUG: 905871
Signed-off-by: Vijaykumar Koppad <vkoppad@redhat.com>
Reviewed-on: http://review.gluster.org/4728
Reviewed-by: Jeff Darcy <jdarcy@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(-)

(limited to 'libglusterfs')

diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c
index a8cdeaf28f8..72dd7e7aada 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