*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@305 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/include/buffer.h b/ceph/include/buffer.h
index 877c16e7194e299b1c6e53f77be6f73bfeb680b4..cabfa9baf4439951c97d561a44fa3e235412c0f9 100644 (file)
--- a/ceph/include/buffer.h
+++ b/ceph/include/buffer.h
@@ -159,7 +159,7 @@ class bufferptr {
   }
 
   ~bufferptr() {
-       if (_buffer->_put() == 0) 
+       if (_buffer && _buffer->_put() == 0) 
          delete _buffer;
   }
 

diff --git a/ceph/include/bufferlist.h b/ceph/include/bufferlist.h
index 3fd4e921997b58c9df6ab27edbc8aa243de16402..355123959686855a24e5c6bf263235874e8d104e 100644 (file)
--- a/ceph/include/bufferlist.h
+++ b/ceph/include/bufferlist.h
@@ -17,13 +17,12 @@ class bufferlist {
  public:
   // cons/des
   ~bufferlist() {
-       clear();
   }
 
   // sort-of-like-assignment-op
   void claim(bufferlist& bl) {
        // free my buffers
-       clear();                    
+       _buffers.clear();                    
        claim_append(bl);
   }
   void claim_append(bufferlist& bl) {
@@ -162,7 +161,7 @@ class bufferlist {
 
 
   void substr_of(bufferlist& other, int off, int len) {
-       clear();
+       _buffers.clear();
 
        // skip off
        list<bufferptr>::iterator curbuf = other._buffers.begin();