2 files changed, 18 insertions, 6 deletions

diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
index e4a70e0cd6..f622225f22 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
@@ -30,15 +30,21 @@ BootloaderInstallIpod::BootloaderInstallIpod(QObject *parent)
 {
     (void)parent;
     // initialize sector buffer. ipod_sectorbuf is defined in ipodpatcher.
-    ipod_sectorbuf = NULL;
-    ipod_alloc_buffer(&ipod_sectorbuf, BUFFER_SIZE);
+    // The buffer itself is only present once, so make sure to not allocate
+    // it if it was already allocated. The application needs to take care
+    // no concurrent (i.e. multiple objects of this class running) requests
+    // are done.
+    if(ipod_sectorbuf == NULL)
+        ipod_alloc_buffer(&ipod_sectorbuf, BUFFER_SIZE);
 }
 
 
 BootloaderInstallIpod::~BootloaderInstallIpod()
 {
-    if(ipod_sectorbuf)
+    if(ipod_sectorbuf) {
         free(ipod_sectorbuf);
+        ipod_sectorbuf = NULL;
+    }
 }
 
 
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
index aab298ce95..19750446f6 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
@@ -30,15 +30,21 @@ BootloaderInstallSansa::BootloaderInstallSansa(QObject *parent)
     (void)parent;
     // initialize sector buffer. sansa_sectorbuf is instantiated by
     // sansapatcher.
-    sansa_sectorbuf = NULL;
-    sansa_alloc_buffer(&sansa_sectorbuf, BUFFER_SIZE);
+    // The buffer itself is only present once, so make sure to not allocate
+    // it if it was already allocated. The application needs to take care
+    // no concurrent (i.e. multiple objects of this class running) requests
+    // are done.
+    if(sansa_sectorbuf == NULL)
+        sansa_alloc_buffer(&sansa_sectorbuf, BUFFER_SIZE);
 }
 
 
 BootloaderInstallSansa::~BootloaderInstallSansa()
 {
-    if(sansa_sectorbuf)
+    if(sansa_sectorbuf) {
         free(sansa_sectorbuf);
+        sansa_sectorbuf = NULL;
+    }
 }