diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | 12 |
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) | |||
30 | { | 30 | { |
31 | (void)parent; | 31 | (void)parent; |
32 | // initialize sector buffer. ipod_sectorbuf is defined in ipodpatcher. | 32 | // initialize sector buffer. ipod_sectorbuf is defined in ipodpatcher. |
33 | ipod_sectorbuf = NULL; | 33 | // The buffer itself is only present once, so make sure to not allocate |
34 | ipod_alloc_buffer(&ipod_sectorbuf, BUFFER_SIZE); | 34 | // it if it was already allocated. The application needs to take care |
35 | // no concurrent (i.e. multiple objects of this class running) requests | ||
36 | // are done. | ||
37 | if(ipod_sectorbuf == NULL) | ||
38 | ipod_alloc_buffer(&ipod_sectorbuf, BUFFER_SIZE); | ||
35 | } | 39 | } |
36 | 40 | ||
37 | 41 | ||
38 | BootloaderInstallIpod::~BootloaderInstallIpod() | 42 | BootloaderInstallIpod::~BootloaderInstallIpod() |
39 | { | 43 | { |
40 | if(ipod_sectorbuf) | 44 | if(ipod_sectorbuf) { |
41 | free(ipod_sectorbuf); | 45 | free(ipod_sectorbuf); |
46 | ipod_sectorbuf = NULL; | ||
47 | } | ||
42 | } | 48 | } |
43 | 49 | ||
44 | 50 | ||
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) | |||
30 | (void)parent; | 30 | (void)parent; |
31 | // initialize sector buffer. sansa_sectorbuf is instantiated by | 31 | // initialize sector buffer. sansa_sectorbuf is instantiated by |
32 | // sansapatcher. | 32 | // sansapatcher. |
33 | sansa_sectorbuf = NULL; | 33 | // The buffer itself is only present once, so make sure to not allocate |
34 | sansa_alloc_buffer(&sansa_sectorbuf, BUFFER_SIZE); | 34 | // it if it was already allocated. The application needs to take care |
35 | // no concurrent (i.e. multiple objects of this class running) requests | ||
36 | // are done. | ||
37 | if(sansa_sectorbuf == NULL) | ||
38 | sansa_alloc_buffer(&sansa_sectorbuf, BUFFER_SIZE); | ||
35 | } | 39 | } |
36 | 40 | ||
37 | 41 | ||
38 | BootloaderInstallSansa::~BootloaderInstallSansa() | 42 | BootloaderInstallSansa::~BootloaderInstallSansa() |
39 | { | 43 | { |
40 | if(sansa_sectorbuf) | 44 | if(sansa_sectorbuf) { |
41 | free(sansa_sectorbuf); | 45 | free(sansa_sectorbuf); |
46 | sansa_sectorbuf = NULL; | ||
47 | } | ||
42 | } | 48 | } |
43 | 49 | ||
44 | 50 | ||