From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Thu, 16 Mar 2006 16:51:25 +0000 (+0000)
Subject: attr_union(): terminate array with NULL
X-Git-Tag: first~24
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=527b720c4ee44aa5babc088329569c96a1b5f03f;p=jra1mw.git

attr_union(): terminate array with NULL
---

diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c
index 17ebf30..ae60d8b 100644
--- a/org.glite.jp.primary/src/feed.c
+++ b/org.glite.jp.primary/src/feed.c
@@ -252,6 +252,8 @@ static void attr_union(char **a, char **b, char ***c)
 		if (j < cnt && j > i+1) memmove(out+i+1,out+j,(cnt-j) * sizeof *out);
 		cnt -= j-i-1;
 	}
+	assert(cnt);
+	out[cnt-1] = NULL;
 
 	*c = out;
 }