From 7f59d855bb160a14a517e82b71e4f387b50cbf63 Mon Sep 17 00:00:00 2001 From: Kaushik BV Date: Thu, 3 Feb 2011 23:15:17 +0000 Subject: libxlator: memdup the data that is required for aggregation of attributes Signed-off-by: Kaushik BV Signed-off-by: Anand V. Avati BUG: 2339 ([glusterfs-3.1.2geosyncqa4]: crash in gsyncd script) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2339 --- xlators/lib/src/libxlator.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xlators/lib/src/libxlator.c b/xlators/lib/src/libxlator.c index 7708f86e619..f43fd381b85 100644 --- a/xlators/lib/src/libxlator.c +++ b/xlators/lib/src/libxlator.c @@ -252,11 +252,15 @@ cluster_markeruuid_cbk (call_frame_t *frame, void *cookie, xlator_t *this, ((volmark->sec == marker->volmark->sec) && (volmark->usec >= marker->volmark->usec))) { - marker->volmark = volmark; + GF_FREE (marker->volmark); + marker->volmark = memdup (volmark, sizeof (struct volume_mark)); + VALIDATE_OR_GOTO (marker->volmark, done); } } else { - marker->volmark = volmark; + marker->volmark = memdup (volmark, sizeof (struct volume_mark)); + VALIDATE_OR_GOTO (marker->volmark, done); + uuid_unparse (volmark->uuid, vol_uuid); if (volmark->retval) callcnt = 0; @@ -277,7 +281,7 @@ done: goto out; } } - if (dict_set_static_bin (dict, GF_XATTR_MARKER_KEY, + if (dict_set_bin (dict, GF_XATTR_MARKER_KEY, marker->volmark, sizeof (struct volume_mark))) { op_ret = -1; -- cgit