From b64d55a5b879812ff01f749a609238316031f332 Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Wed, 16 Dec 2009 00:48:16 +0000 Subject: cluster/dht: Check for pointers before de-referencing in dht_stat_merge() Signed-off-by: Vijay Bellur Signed-off-by: Vijay Bellur BUG: 463 (Crash in dht_stat_merge ()) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=463 --- xlators/cluster/dht/src/dht-helper.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'xlators/cluster/dht/src/dht-helper.c') diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index 1b49046ce..9816c1784 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -320,6 +320,9 @@ int dht_stat_merge (xlator_t *this, struct stat *to, struct stat *from, xlator_t *subvol) { + if (!from || !to) + return 0; + to->st_dev = from->st_dev; dht_itransform (this, subvol, from->st_ino, &to->st_ino); -- cgit