Initialise _soundcloud_upload to false in ExportFormatSpecification

[ardour.git] / libs / ardour / worker.cc

diff --git a/libs/ardour/worker.cc b/libs/ardour/worker.cc
index b110dc286f875454f272cfef6735267a5f7d6407..aea1c6f8e35597a191cf374c617d928376f8dda2 100644 (file)
--- a/libs/ardour/worker.cc
+++ b/libs/ardour/worker.cc
@@ -124,6 +124,7 @@ Worker::run()
        while (true) {
                _sem.wait();
                if (_exit) {
+                       if (buf) free(buf);
                        return;
                }
 
@@ -135,6 +136,7 @@ Worker::run()
                while (!verify_message_completeness(_requests)) {
                        Glib::usleep(2000);
                        if (_exit) {
+                               if (buf) free(buf);
                                return;
                        }
                }
@@ -146,7 +148,13 @@ Worker::run()
 
                if (size > buf_size) {
                        buf = realloc(buf, size);
-                       buf_size = size;
+                       if (buf) {
+                               buf_size = size;
+                       } else {
+                               PBD::error << "Worker: Error allocating memory"
+                                          << endmsg;
+                               buf_size = 0; // TODO: This is probably fatal
+                       }
                }
 
                if (_requests->read((uint8_t*)buf, size) < size) {