LADI
/
jackdbus
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent undefined behavior, fix code-style.

This commit is contained in:
Thomas Brand 2019-02-20 16:13:03 +01:00
parent d4ef6800b4
commit d63193b6eb
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/JackGraphManager.cpp
View File

@ -807,27 +807,25 @@ const char** JackGraphManager::GetConnections(jack_port_id_t port_index)
// Client
void JackGraphManager::GetPortsAux(const char** matching_ports, const char* port_name_pattern, const char* type_name_pattern, unsigned long flags)
{
// Cleanup port array
memset(matching_ports, 0, sizeof(char*) * fPortMax);
int match_cnt = 0;
regex_t port_regex, type_regex;
if (port_name_pattern && port_name_pattern[0]) {
if(regcomp(&port_regex, port_name_pattern, REG_EXTENDED | REG_NOSUB)!=0)
{
if (regcomp(&port_regex, port_name_pattern, REG_EXTENDED | REG_NOSUB)!=0) {
jack_log("JackGraphManager::GetPortsAux could not compile regex for port_name_pattern '%s'", port_name_pattern);
return;
}
}
if (type_name_pattern && type_name_pattern[0]) {
if(regcomp(&type_regex, type_name_pattern, REG_EXTENDED | REG_NOSUB)!=0)
{
if (regcomp(&type_regex, type_name_pattern, REG_EXTENDED | REG_NOSUB)!=0) {
jack_log("JackGraphManager::GetPortsAux could not compile regex for type_name_pattern '%s'", type_name_pattern);
return;
}
}
// Cleanup port array
memset(matching_ports, 0, sizeof(char*) * fPortMax);
for (unsigned int i = 0; i < fPortMax; i++) {
bool matching = true;
JackPort* port = GetPort(i);