]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
common/buffer.cc: silence ASan warning
authorKefu Chai <kchai@redhat.com>
Sat, 7 Mar 2020 11:36:52 +0000 (19:36 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 9 Mar 2020 03:49:57 +0000 (11:49 +0800)
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>
src/common/buffer.cc

index 3204db6e6362814dd712517f963eddb5ca9556c6..0446ec88cf8852a5814b05cddfbad84d8227217c 100644 (file)
@@ -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);