From: Kefu Chai <kchai@redhat.com>
Date: Sat, 7 Mar 2020 11:36:52 +0000 (+0800)
Subject: common/buffer.cc: silence ASan warning
X-Git-Tag: v15.1.1~63^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1e37793c3dcbebdb9315238a1ed8a3e46cfd98f5;p=ceph-ci.git

common/buffer.cc: silence ASan warning

silences following warning
```
../src/common/buffer.cc:472:9: runtime error: member access within null pointer of type 'struct raw'
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 3204db6e636..0446ec88cf8 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -469,8 +469,8 @@ static ceph::spinlock debug_lock;
         const auto* delete_raw = _raw;
         _raw = nullptr;
 	//cout << "hosing raw " << (void*)_raw << " len " << _raw->len << std::endl;
-        ANNOTATE_HAPPENS_AFTER(&_raw->nref);
-        ANNOTATE_HAPPENS_BEFORE_FORGET_ALL(&_raw->nref);
+        ANNOTATE_HAPPENS_AFTER(&delete_raw->nref);
+        ANNOTATE_HAPPENS_BEFORE_FORGET_ALL(&delete_raw->nref);
 	delete delete_raw;  // dealloc old (if any)
       } else {
         ANNOTATE_HAPPENS_BEFORE(&_raw->nref);