Fix scoped_refptr leave ptr_ uninit when move construct by nullptr (#…

…2491) * Fix scoped_refptr leave ptr_ uninit when move construct by nullptr --------- Co-authored-by: 扬宁 <yangning.lzy@alibaba-inc.com>
apache · Jan 3, 2024 · 9fd7e21 · 9fd7e21
1 parent 023fa14
commit 9fd7e21
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/butil/memory/ref_counted.h b/src/butil/memory/ref_counted.h
@@ -286,20 +286,16 @@ class scoped_refptr {
   }
 
   scoped_refptr(scoped_refptr<T>&& r) noexcept {
-    if (r.ptr_){
-      ptr_ = r.ptr_;
-      r.ptr_ = nullptr;
-    }
+    ptr_ = r.ptr_;
+    r.ptr_ = nullptr;
   }
 
   template <typename U>
   scoped_refptr(scoped_refptr<U>&& r) noexcept {
-    if (r.ptr_){
-      ptr_ = r.ptr_;
-      r.ptr_ = nullptr;
-    }
+    ptr_ = r.ptr_;
+    r.ptr_ = nullptr;
   }
- 
+
   ~scoped_refptr() {
     if (ptr_)
       ptr_->Release();

diff --git a/test/ref_counted_unittest.cc b/test/ref_counted_unittest.cc
@@ -82,3 +82,16 @@ TEST(RefCountedUnitTest, ScopedRefPtrBooleanOperations) {
   EXPECT_NE(raw_p, p2);
   EXPECT_EQ(p1, p2);
 }
+
+TEST(RefCountedUnitTest, ScopedRefPtrMoveCtor)
+{
+  scoped_refptr<SelfAssign> p1 = new SelfAssign;
+  EXPECT_TRUE(p1);
+
+  scoped_refptr<SelfAssign> p2(std::move(p1));
+  EXPECT_TRUE(p2);
+  EXPECT_FALSE(p1);
+
+  scoped_refptr<SelfAssign> p3(std::move(p1));
+  EXPECT_FALSE(p3);
+}