Merge "amidi: Don't create extra write buffer"

2022-01-28 18:12:43 +00:00
parent 288b4bc054 2136d8d77e
commit ca1aa4e0c9
1 changed files with 5 additions and 1 deletions
--- a/media/native/midi/amidi.cpp
+++ b/media/native/midi/amidi.cpp
@@ -401,10 +401,14 @@ ssize_t AMIDI_API AMidiInputPort_send(const AMidiInputPort *inputPort, const uin

 ssize_t AMIDI_API AMidiInputPort_sendWithTimestamp(const AMidiInputPort *inputPort,
        const uint8_t *data, size_t numBytes, int64_t timestamp) {
-    if (inputPort == nullptr || data == nullptr) {
+    if (inputPort == nullptr || data == nullptr || numBytes < 0 || timestamp < 0) {
        return AMEDIA_ERROR_INVALID_PARAMETER;
    }

+    if (numBytes == 0) {
+        return 0;
+    }
+
    // AMIDI_logBuffer(data, numBytes);

    uint8_t writeBuffer[AMIDI_BUFFER_SIZE + AMIDI_PACKET_OVERHEAD];