From: Julian Andres Klode <jak@debian.org>
Date: Mon, 28 Dec 2015 14:04:57 +0000 (+0100)
Subject: simple_buffer: Allow buffer size to change
X-Git-Tag: 1.2_exp1~48
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/5bdba2ca232b1f49165fbfcff8341b0887076a34

simple_buffer: Allow buffer size to change

Gbp-Dch: ignore
---

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 7f3ed673a..54af25369 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -920,16 +920,32 @@ bool ChangeOwnerAndPermissionOfFile(char const * const requester, char const * c
 									/*}}}*/
 
 struct APT_HIDDEN simple_buffer {							/*{{{*/
-   static constexpr size_t buffersize_max = 4096;
+   size_t buffersize_max = 0;
    unsigned long long bufferstart = 0;
    unsigned long long bufferend = 0;
-   char buffer[buffersize_max];
+   char *buffer = nullptr;
+
+   simple_buffer() {
+      reset(4096);
+   }
+   ~simple_buffer() {
+      delete buffer;
+   }
 
    const char *get() const { return buffer + bufferstart; }
    char *get() { return buffer + bufferstart; }
    bool empty() const { return bufferend <= bufferstart; }
    bool full() const { return bufferend == buffersize_max; }
    unsigned long long size() const { return bufferend-bufferstart; }
+   void reset(size_t size)
+   {
+      if (size > buffersize_max) {
+	 delete[] buffer;
+	 buffersize_max = size;
+	 buffer = new char[size];
+      }
+      reset();
+   }
    void reset() { bufferend = bufferstart = 0; }
    ssize_t read(void *to, unsigned long long requested_size) APT_MUSTCHECK
    {