Skip to content

Copy error message to RtMidiWrapper before it's freed #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garyscavone merged 1 commit into from
Aug 25, 2025
Merged

Copy error message to RtMidiWrapper before it's freed #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions rtmidi_c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ class CallbackProxyUserData
#endif
extern "C" const unsigned int rtmidi_num_compiled_apis;

static void rtmidi_set_error_msg (RtMidiPtr device, const char *err);

/* RtMidi API */
const char* rtmidi_get_version()
{
Expand Down Expand Up @@ -102,7 +104,7 @@ void rtmidi_open_port (RtMidiPtr device, unsigned int portNumber, const char *po

} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
}
}

Expand All @@ -114,7 +116,7 @@ void rtmidi_open_virtual_port (RtMidiPtr device, const char *portName)

} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
}

}
Expand All @@ -126,7 +128,7 @@ void rtmidi_close_port (RtMidiPtr device)

} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
}
}

Expand All @@ -137,7 +139,7 @@ unsigned int rtmidi_get_port_count (RtMidiPtr device)

} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
return -1;
}
}
Expand All @@ -153,7 +155,7 @@ int rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber, char * bufO
name = ((RtMidi*) device->ptr)->getPortName (portNumber);
} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
return -1;
}

Expand All @@ -168,21 +170,21 @@ int rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber, char * bufO
/* RtMidiIn API */
RtMidiInPtr rtmidi_in_create_default ()
{
RtMidiWrapper* wrp = new RtMidiWrapper;
RtMidiWrapper* wrp = new RtMidiWrapper{};

try {
RtMidiIn* rIn = new RtMidiIn ();

wrp->ptr = (void*) rIn;
wrp->data = 0;
wrp->ok = true;
wrp->msg = "";
rtmidi_set_error_msg (wrp, "");

} catch (const RtMidiError & err) {
wrp->ptr = 0;
wrp->data = 0;
wrp->ok = false;
wrp->msg = err.what ();
rtmidi_set_error_msg (wrp, err.what ());
}

return wrp;
Expand All @@ -191,28 +193,30 @@ RtMidiInPtr rtmidi_in_create_default ()
RtMidiInPtr rtmidi_in_create (enum RtMidiApi api, const char *clientName, unsigned int queueSizeLimit)
{
std::string name = clientName;
RtMidiWrapper* wrp = new RtMidiWrapper;
RtMidiWrapper* wrp = new RtMidiWrapper{};

try {
RtMidiIn* rIn = new RtMidiIn ((RtMidi::Api) api, name, queueSizeLimit);

wrp->ptr = (void*) rIn;
wrp->data = 0;
wrp->ok = true;
wrp->msg = "";
rtmidi_set_error_msg (wrp, "");

} catch (const RtMidiError & err) {
wrp->ptr = 0;
wrp->data = 0;
wrp->ok = false;
wrp->msg = err.what ();
rtmidi_set_error_msg (wrp, err.what ());
}

return wrp;
}

void rtmidi_in_free (RtMidiInPtr device)
{
if (device->msg)
free (device->msg);
if (device->data)
delete (CallbackProxyUserData*) device->data;
delete (RtMidiIn*) device->ptr;
Expand All @@ -226,7 +230,7 @@ enum RtMidiApi rtmidi_in_get_current_api (RtMidiPtr device)

} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());

return RTMIDI_API_UNSPECIFIED;
}
Expand All @@ -246,7 +250,7 @@ void rtmidi_in_set_callback (RtMidiInPtr device, RtMidiCCallback callback, void
((RtMidiIn*) device->ptr)->setCallback (callback_proxy, device->data);
} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
delete (CallbackProxyUserData*) device->data;
device->data = 0;
}
Expand All @@ -260,7 +264,7 @@ void rtmidi_in_cancel_callback (RtMidiInPtr device)
device->data = 0;
} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
}
}

Expand All @@ -287,42 +291,42 @@ double rtmidi_in_get_message (RtMidiInPtr device,
}
catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
return -1;
}
catch (...) {
device->ok = false;
device->msg = "Unknown error";
rtmidi_set_error_msg (device, "Unknown error");
return -1;
}
}

/* RtMidiOut API */
RtMidiOutPtr rtmidi_out_create_default ()
{
RtMidiWrapper* wrp = new RtMidiWrapper;
RtMidiWrapper* wrp = new RtMidiWrapper{};

try {
RtMidiOut* rOut = new RtMidiOut ();

wrp->ptr = (void*) rOut;
wrp->data = 0;
wrp->ok = true;
wrp->msg = "";
rtmidi_set_error_msg (wrp, "");

} catch (const RtMidiError & err) {
wrp->ptr = 0;
wrp->data = 0;
wrp->ok = false;
wrp->msg = err.what ();
rtmidi_set_error_msg (wrp, err.what ());
}

return wrp;
}

RtMidiOutPtr rtmidi_out_create (enum RtMidiApi api, const char *clientName)
{
RtMidiWrapper* wrp = new RtMidiWrapper;
RtMidiWrapper* wrp = new RtMidiWrapper{};
std::string name = clientName;

try {
Expand All @@ -331,13 +335,13 @@ RtMidiOutPtr rtmidi_out_create (enum RtMidiApi api, const char *clientName)
wrp->ptr = (void*) rOut;
wrp->data = 0;
wrp->ok = true;
wrp->msg = "";
rtmidi_set_error_msg (wrp, "");

} catch (const RtMidiError & err) {
wrp->ptr = 0;
wrp->data = 0;
wrp->ok = false;
wrp->msg = err.what ();
rtmidi_set_error_msg (wrp, err.what ());
}


Expand All @@ -346,6 +350,8 @@ RtMidiOutPtr rtmidi_out_create (enum RtMidiApi api, const char *clientName)

void rtmidi_out_free (RtMidiOutPtr device)
{
if (device->msg)
free (device->msg);
delete (RtMidiOut*) device->ptr;
delete device;
}
Expand All @@ -357,7 +363,7 @@ enum RtMidiApi rtmidi_out_get_current_api (RtMidiPtr device)

} catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());

return RTMIDI_API_UNSPECIFIED;
}
Expand All @@ -371,12 +377,20 @@ int rtmidi_out_send_message (RtMidiOutPtr device, const unsigned char *message,
}
catch (const RtMidiError & err) {
device->ok = false;
device->msg = err.what ();
rtmidi_set_error_msg (device, err.what ());
return -1;
}
catch (...) {
device->ok = false;
device->msg = "Unknown error";
rtmidi_set_error_msg (device, "Unknown error");
return -1;
}
}

static void rtmidi_set_error_msg (RtMidiPtr device, const char *err)
{
if (device->msg) {
free (device->msg);
}
device->msg = strdup(err);
}
2 changes: 1 addition & 1 deletion rtmidi_c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct RtMidiWrapper {
bool ok;

//! If an error occurred (ok != true), set to an error message.
const char* msg;
char* msg;
};

//! \brief Typedef for a generic RtMidi pointer.
Expand Down
Loading