1 files changed, 29 insertions, 31 deletions

diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc
index d11959f4..70d906ea 100644
--- a/libqpdf/Pl_Buffer.cc
+++ b/libqpdf/Pl_Buffer.cc
@@ -4,13 +4,22 @@
 #include <assert.h>
 #include <string.h>
 
-Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) :
-    Pipeline(identifier, next),
+Pl_Buffer::Members::Members() :
     ready(true),
     total_size(0)
 {
 }
 
+Pl_Buffer::Members::~Members()
+{
+}
+
+Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) :
+    Pipeline(identifier, next),
+    m(new Members())
+{
+}
+
 Pl_Buffer::~Pl_Buffer()
 {
 }
@@ -18,32 +27,25 @@ Pl_Buffer::~Pl_Buffer()
 void
 Pl_Buffer::write(unsigned char* buf, size_t len)
 {
-    PointerHolder<Buffer> cur_buf;
-    size_t cur_size = 0;
-    if (! this->data.empty())
+    if (this->m->data.getPointer() == 0)
     {
-        cur_buf = this->data.back();
-        cur_size = cur_buf->getSize();
+        this->m->data = new Buffer(len);
     }
-    size_t left = cur_size - this->total_size;
+    size_t cur_size = this->m->data->getSize();
+    size_t left = cur_size - this->m->total_size;
     if (left < len)
     {
-        size_t new_size = std::max(this->total_size + len, 2 * cur_size);
-        Buffer* b = new Buffer(new_size);
-        if (cur_buf.getPointer())
-        {
-            memcpy(b->getBuffer(), cur_buf->getBuffer(), this->total_size);
-        }
-        this->data.clear();
-        cur_buf = b;
-        this->data.push_back(cur_buf);
+        size_t new_size = std::max(this->m->total_size + len, 2 * cur_size);
+        PointerHolder<Buffer> b = new Buffer(new_size);
+        memcpy(b->getBuffer(), this->m->data->getBuffer(), this->m->total_size);
+        this->m->data = b;
     }
     if (len)
     {
-        memcpy(cur_buf->getBuffer() + this->total_size, buf, len);
-        this->total_size += len;
+        memcpy(this->m->data->getBuffer() + this->m->total_size, buf, len);
+        this->m->total_size += len;
     }
-    this->ready = false;
+    this->m->ready = false;
 
     if (getNext(true))
     {
@@ -54,7 +56,7 @@ Pl_Buffer::write(unsigned char* buf, size_t len)
 void
 Pl_Buffer::finish()
 {
-    this->ready = true;
+    this->m->ready = true;
     if (getNext(true))
     {
 	getNext()->finish();
@@ -64,21 +66,17 @@ Pl_Buffer::finish()
 Buffer*
 Pl_Buffer::getBuffer()
 {
-    if (! this->ready)
+    if (! this->m->ready)
     {
 	throw std::logic_error("Pl_Buffer::getBuffer() called when not ready");
     }
 
-    Buffer* b = new Buffer(this->total_size);
-    unsigned char* p = b->getBuffer();
-    if (! this->data.empty())
+    Buffer* b = new Buffer(this->m->total_size);
+    if (this->m->total_size > 0)
     {
-        PointerHolder<Buffer> bp = this->data.back();
-        this->data.clear();
-        memcpy(p, bp->getBuffer(), this->total_size);
+        unsigned char* p = b->getBuffer();
+        memcpy(p, this->m->data->getBuffer(), this->m->total_size);
     }
-    this->total_size = 0;
-    this->ready = false;
-
+    this->m = new Members();
     return b;
 }