Fix some clang warnings (argument with 'nonnull' attribute passed null)

diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index aea02033943c94c6cd234353b1446d340c53364d..559a9c616dd1a2571747f60679f38a973ea42c83 100644 (file)
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -926,7 +926,9 @@ AudioSource::compute_and_write_peaks (Sample* buf, samplecnt_t first_sample, sam
                memcpy (buf2.get(), peak_leftovers, peak_leftover_cnt * sizeof (Sample));
 
                /* the new stuff */
-               memcpy (buf2.get()+peak_leftover_cnt, buf, cnt * sizeof (Sample));
+               if (buf && cnt > 0) {
+                       memcpy (buf2.get()+peak_leftover_cnt, buf, cnt * sizeof (Sample));
+               }
 
                /* no more leftovers */
                peak_leftover_cnt = 0;

diff --git a/libs/backends/alsa/alsa_midi.cc b/libs/backends/alsa/alsa_midi.cc
index d9d473a84d8a2272b937fa16d4a755c87c32eb09..8bf7f4aecedbba182d2fd029f2f175aa0a78bca3 100644 (file)
--- a/libs/backends/alsa/alsa_midi.cc
+++ b/libs/backends/alsa/alsa_midi.cc
@@ -186,7 +186,7 @@ AlsaMidiIn::recv_event (pframes_t &time, uint8_t *data, size_t &size)
                if (vector.len[0] > 0) {
                        memcpy ((uint8_t*)&h, vector.buf[0], vector.len[0]);
                }
-               assert(vector.buf[1] || vector.len[0] == sizeof(MidiEventHeader));
+               assert(vector.buf[1]);
                memcpy (((uint8_t*)&h) + vector.len[0], vector.buf[1], sizeof(MidiEventHeader) - vector.len[0]);
        }
 

diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp
index b5d34aa53839ecdf613c4c2b8c5b5a8b9d903be8..60d69c8a4dc0b60f97e6be6b7b26903cba21ea0c 100644 (file)
--- a/libs/evoral/src/SMF.cpp
+++ b/libs/evoral/src/SMF.cpp
@@ -326,6 +326,7 @@ SMF::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf, event_id_t* no
                if (*size < (unsigned)event_size) {
                        *buf = (uint8_t*)realloc(*buf, event_size);
                }
+               assert (*buf);
                memcpy(*buf, event->midi_buffer, size_t(event_size));
                *size = event_size;
                if (((*buf)[0] & 0xF0) == 0x90 && (*buf)[2] == 0) {