diff options
31 files changed, 77 insertions, 78 deletions
diff --git a/android/Shm.cpp b/android/Shm.cpp index 1149616f..275b6773 100644 --- a/android/Shm.cpp +++ b/android/Shm.cpp @@ -81,7 +81,7 @@ namespace android { /* pointers to registry header and array */ jack_shm_header_t *Shm::jack_shm_header = NULL; jack_shm_registry_t *Shm::jack_shm_registry = NULL; - char Shm::jack_shm_server_prefix[JACK_SERVER_NAME_SIZE] = ""; + char Shm::jack_shm_server_prefix[JACK_SERVER_NAME_SIZE+1] = ""; /* jack_shm_lock_registry() serializes updates to the shared memory * segment JACK uses to keep track of the SHM segments allocated to diff --git a/android/Shm.h b/android/Shm.h index cb75396e..6c8ecb43 100644 --- a/android/Shm.h +++ b/android/Shm.h @@ -124,7 +124,7 @@ namespace android { static jack_shm_info_t registry_info; static jack_shm_header_t *jack_shm_header; static jack_shm_registry_t *jack_shm_registry; - static char jack_shm_server_prefix[JACK_SERVER_NAME_SIZE]; + static char jack_shm_server_prefix[JACK_SERVER_NAME_SIZE+1]; static int semid; static pthread_mutex_t mutex; static Shm* ref; diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp index 7ead9f1c..c2ea6400 100644 --- a/common/JackAPI.cpp +++ b/common/JackAPI.cpp @@ -1481,12 +1481,12 @@ LIB_EXPORT char* jack_get_client_name(jack_client_t* ext_client) LIB_EXPORT int jack_client_name_size(void) { - return JACK_CLIENT_NAME_SIZE; + return JACK_CLIENT_NAME_SIZE+1; } LIB_EXPORT int jack_port_name_size(void) { - return REAL_JACK_PORT_NAME_SIZE; + return REAL_JACK_PORT_NAME_SIZE+1; } LIB_EXPORT int jack_port_type_size(void) diff --git a/common/JackAudioDriver.cpp b/common/JackAudioDriver.cpp index 52ab00a8..e699bef5 100644 --- a/common/JackAudioDriver.cpp +++ b/common/JackAudioDriver.cpp @@ -115,8 +115,8 @@ int JackAudioDriver::Attach() { JackPort* port; jack_port_id_t port_index; - char name[REAL_JACK_PORT_NAME_SIZE]; - char alias[REAL_JACK_PORT_NAME_SIZE]; + char name[REAL_JACK_PORT_NAME_SIZE+1]; + char alias[REAL_JACK_PORT_NAME_SIZE+1]; int i; jack_log("JackAudioDriver::Attach fBufferSize = %ld fSampleRate = %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); diff --git a/common/JackClient.cpp b/common/JackClient.cpp index e2edd544..7334a57a 100644 --- a/common/JackClient.cpp +++ b/common/JackClient.cpp @@ -1195,7 +1195,7 @@ int JackClient::SetLatencyCallback(JackLatencyCallback callback, void *arg) char* JackClient::GetInternalClientName(int ref) { - char name_res[JACK_CLIENT_NAME_SIZE + 1]; + char name_res[JACK_CLIENT_NAME_SIZE+1]; int result = -1; fChannel->GetInternalClientName(GetClientControl()->fRefNum, ref, name_res, &result); return (result < 0) ? NULL : strdup(name_res); diff --git a/common/JackClient.h b/common/JackClient.h index b8ed0b2f..3013334b 100644 --- a/common/JackClient.h +++ b/common/JackClient.h @@ -87,7 +87,7 @@ class SERVER_EXPORT JackClient : public JackClientInterface, public JackRunnable void* fThreadFunArg; void* fSessionArg; void* fLatencyArg; - char fServerName[JACK_SERVER_NAME_SIZE]; + char fServerName[JACK_SERVER_NAME_SIZE+1]; JackThread fThread; /*! Thread to execute the Process function */ detail::JackClientChannelInterface* fChannel; diff --git a/common/JackDebugClient.h b/common/JackDebugClient.h index 9eea72db..541c8cd8 100644 --- a/common/JackDebugClient.h +++ b/common/JackDebugClient.h @@ -59,7 +59,7 @@ class JackDebugClient : public JackClient int fIsDeactivated; int fIsClosed; bool fFreewheel; - char fClientName[JACK_CLIENT_NAME_SIZE + 1]; + char fClientName[JACK_CLIENT_NAME_SIZE+1]; JackProcessCallback fProcessTimeCallback; void* fProcessTimeCallbackArg; diff --git a/common/JackDriver.cpp b/common/JackDriver.cpp index 0b732c4e..c6019855 100644 --- a/common/JackDriver.cpp +++ b/common/JackDriver.cpp @@ -422,10 +422,10 @@ static string RemoveLast(const string& name) void JackDriver::SaveConnections(int alias) { const char** connections; - char alias1[REAL_JACK_PORT_NAME_SIZE]; - char alias2[REAL_JACK_PORT_NAME_SIZE]; - char system_alias1[REAL_JACK_PORT_NAME_SIZE]; - char system_alias2[REAL_JACK_PORT_NAME_SIZE]; + char alias1[REAL_JACK_PORT_NAME_SIZE+1]; + char alias2[REAL_JACK_PORT_NAME_SIZE+1]; + char system_alias1[REAL_JACK_PORT_NAME_SIZE+1]; + char system_alias2[REAL_JACK_PORT_NAME_SIZE+1]; char* aliases[2]; char* system_aliases[2]; @@ -506,8 +506,8 @@ void JackDriver::SaveConnections(int alias) string JackDriver::MatchPortName(const char* name, const char** ports, int alias, const std::string& type) { - char alias1[REAL_JACK_PORT_NAME_SIZE]; - char alias2[REAL_JACK_PORT_NAME_SIZE]; + char alias1[REAL_JACK_PORT_NAME_SIZE+1]; + char alias2[REAL_JACK_PORT_NAME_SIZE+1]; char* aliases[2]; aliases[0] = alias1; diff --git a/common/JackDriver.h b/common/JackDriver.h index 804d9b27..3dd88e81 100644 --- a/common/JackDriver.h +++ b/common/JackDriver.h @@ -129,10 +129,9 @@ class SERVER_EXPORT JackDriver : public JackDriverClientInterface protected: - char fCaptureDriverName[JACK_CLIENT_NAME_SIZE + 1]; - char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE + 1]; - - char fAliasName[JACK_CLIENT_NAME_SIZE + 1]; + char fCaptureDriverName[JACK_CLIENT_NAME_SIZE+1]; + char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE+1]; + char fAliasName[JACK_CLIENT_NAME_SIZE+1]; jack_nframes_t fCaptureLatency; jack_nframes_t fPlaybackLatency; diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp index 81f381f4..15076599 100644 --- a/common/JackEngine.cpp +++ b/common/JackEngine.cpp @@ -1038,7 +1038,7 @@ int JackEngine::PortDisconnect(int refnum, jack_port_id_t src, jack_port_id_t ds int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name) { - char old_name[REAL_JACK_PORT_NAME_SIZE]; + char old_name[REAL_JACK_PORT_NAME_SIZE+1]; strcpy(old_name, fGraphManager->GetPort(port)->GetName()); fGraphManager->GetPort(port)->SetName(name); NotifyPortRename(port, old_name); diff --git a/common/JackEngineControl.h b/common/JackEngineControl.h index 32526f0e..5e499525 100644 --- a/common/JackEngineControl.h +++ b/common/JackEngineControl.h @@ -63,7 +63,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem int fServerPriority; int fClientPriority; int fMaxClientPriority; - char fServerName[JACK_SERVER_NAME_SIZE]; + char fServerName[JACK_SERVER_NAME_SIZE+1]; JackTransportEngine fTransport; jack_timer_type_t fClockSource; int fDriverNum; diff --git a/common/JackLibClient.cpp b/common/JackLibClient.cpp index 2cd9c4a0..9eb7e350 100644 --- a/common/JackLibClient.cpp +++ b/common/JackLibClient.cpp @@ -98,7 +98,7 @@ int JackLibClient::Open(const char* server_name, const char* name, int uuid, jac strncpy(fServerName, server_name, sizeof(fServerName)); // Open server/client channel - char name_res[JACK_CLIENT_NAME_SIZE + 1]; + char name_res[JACK_CLIENT_NAME_SIZE+1]; if (fChannel->Open(server_name, name, uuid, name_res, this, options, status) < 0) { jack_error("Cannot connect to the server"); goto error; diff --git a/common/JackMidiDriver.cpp b/common/JackMidiDriver.cpp index 482d1fe5..22060076 100644 --- a/common/JackMidiDriver.cpp +++ b/common/JackMidiDriver.cpp @@ -58,8 +58,8 @@ int JackMidiDriver::Attach() { JackPort* port; jack_port_id_t port_index; - char name[REAL_JACK_PORT_NAME_SIZE]; - char alias[REAL_JACK_PORT_NAME_SIZE]; + char name[REAL_JACK_PORT_NAME_SIZE+1]; + char alias[REAL_JACK_PORT_NAME_SIZE+1]; int i; jack_log("JackMidiDriver::Attach fBufferSize = %ld fSampleRate = %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); diff --git a/common/JackNetAPI.cpp b/common/JackNetAPI.cpp index bdf265f0..09962ca7 100644 --- a/common/JackNetAPI.cpp +++ b/common/JackNetAPI.cpp @@ -519,7 +519,7 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf fBufferSizeCallback(NULL), fBufferSizeArg(NULL), fSampleRateCallback(NULL), fSampleRateArg(NULL) { - char host_name[JACK_CLIENT_NAME_SIZE]; + char host_name[JACK_CLIENT_NAME_SIZE + 1]; // Request parameters assert(strlen(ip) < 32); diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp index c9a11a98..3918582c 100644 --- a/common/JackNetDriver.cpp +++ b/common/JackNetDriver.cpp @@ -318,8 +318,8 @@ namespace Jack JackPort* port; jack_port_id_t port_index; - char name[REAL_JACK_PORT_NAME_SIZE]; - char alias[REAL_JACK_PORT_NAME_SIZE]; + char name[REAL_JACK_PORT_NAME_SIZE+1]; + char alias[REAL_JACK_PORT_NAME_SIZE+1]; int audio_port_index; int midi_port_index; @@ -720,7 +720,7 @@ Deactivated for now.. SERVER_EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) { char multicast_ip[32]; - char net_name[JACK_CLIENT_NAME_SIZE + 1] = {0}; + char net_name[JACK_CLIENT_NAME_SIZE+1] = {0}; int udp_port; int mtu = DEFAULT_MTU; // Desactivated for now... diff --git a/common/JackNetTool.h b/common/JackNetTool.h index 33d586d2..79c82f5c 100644 --- a/common/JackNetTool.h +++ b/common/JackNetTool.h @@ -94,9 +94,9 @@ namespace Jack char fPacketType[8]; //packet type ('param') uint32_t fProtocolVersion; //version int32_t fPacketID; //indicates the packet type - char fName[JACK_CLIENT_NAME_SIZE]; //slave's name - char fMasterNetName[JACK_SERVER_NAME_SIZE]; //master hostname (network) - char fSlaveNetName[JACK_SERVER_NAME_SIZE]; //slave hostname (network) + char fName[JACK_CLIENT_NAME_SIZE+1]; //slave's name + char fMasterNetName[JACK_SERVER_NAME_SIZE+1]; //master hostname (network) + char fSlaveNetName[JACK_SERVER_NAME_SIZE+1]; //slave hostname (network) uint32_t fMtu; //connection mtu uint32_t fID; //slave's ID uint32_t fTransportSync; //is the transport synced ? diff --git a/common/JackPort.cpp b/common/JackPort.cpp index 623a48f2..417882d4 100644 --- a/common/JackPort.cpp +++ b/common/JackPort.cpp @@ -230,7 +230,7 @@ void JackPort::SetName(const char* new_name) bool JackPort::NameEquals(const char* target) { - char buf[REAL_JACK_PORT_NAME_SIZE]; + char buf[REAL_JACK_PORT_NAME_SIZE+1]; /* this nasty, nasty kludge is here because between 0.109.0 and 0.109.1, the ALSA audio backend had the name "ALSA", whereas as before and diff --git a/common/JackPort.h b/common/JackPort.h index f7a601ed..5cd9aef2 100644 --- a/common/JackPort.h +++ b/common/JackPort.h @@ -45,9 +45,9 @@ class SERVER_EXPORT JackPort int fTypeId; enum JackPortFlags fFlags; - char fName[REAL_JACK_PORT_NAME_SIZE]; - char fAlias1[REAL_JACK_PORT_NAME_SIZE]; - char fAlias2[REAL_JACK_PORT_NAME_SIZE]; + char fName[REAL_JACK_PORT_NAME_SIZE+1]; + char fAlias1[REAL_JACK_PORT_NAME_SIZE+1]; + char fAlias2[REAL_JACK_PORT_NAME_SIZE+1]; int fRefNum; jack_nframes_t fLatency; diff --git a/common/JackProxyDriver.h b/common/JackProxyDriver.h index f7b25e41..82156555 100644 --- a/common/JackProxyDriver.h +++ b/common/JackProxyDriver.h @@ -62,9 +62,9 @@ namespace Jack private: - char fUpstream[JACK_CLIENT_NAME_SIZE]; /*<! the upstream server name */ - char fClientName[JACK_CLIENT_NAME_SIZE]; /*<! client name to use when connecting */ - const char* fPromiscuous; /*<! if not null, group or gid to use for promiscuous mode */ + char fUpstream[JACK_CLIENT_NAME_SIZE+1]; /*<! the upstream server name */ + char fClientName[JACK_CLIENT_NAME_SIZE+1]; /*<! client name to use when connecting */ + const char* fPromiscuous; /*<! if not null, group or gid to use for promiscuous mode */ //jack data jack_client_t* fClient; /*<! client handle */ diff --git a/common/JackRequest.h b/common/JackRequest.h index 56c203ac..9e3d2b84 100644 --- a/common/JackRequest.h +++ b/common/JackRequest.h @@ -157,7 +157,7 @@ struct JackResult struct JackClientCheckRequest : public JackRequest { - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; int fProtocol; int fOptions; int fUUID; @@ -202,7 +202,7 @@ struct JackClientCheckRequest : public JackRequest struct JackClientCheckResult : public JackResult { - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; int fStatus; JackClientCheckResult(): JackResult(), fStatus(0) @@ -240,7 +240,7 @@ struct JackClientOpenRequest : public JackRequest int fPID; int fUUID; - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; JackClientOpenRequest() {} @@ -517,8 +517,8 @@ struct JackPortConnectNameRequest : public JackRequest { int fRefNum; - char fSrc[REAL_JACK_PORT_NAME_SIZE + 1]; // port full name - char fDst[REAL_JACK_PORT_NAME_SIZE + 1]; // port full name + char fSrc[REAL_JACK_PORT_NAME_SIZE+1]; // port full name + char fDst[REAL_JACK_PORT_NAME_SIZE+1]; // port full name JackPortConnectNameRequest() {} @@ -559,8 +559,8 @@ struct JackPortDisconnectNameRequest : public JackRequest { int fRefNum; - char fSrc[REAL_JACK_PORT_NAME_SIZE + 1]; // port full name - char fDst[REAL_JACK_PORT_NAME_SIZE + 1]; // port full name + char fSrc[REAL_JACK_PORT_NAME_SIZE+1]; // port full name + char fDst[REAL_JACK_PORT_NAME_SIZE+1]; // port full name JackPortDisconnectNameRequest() {} @@ -901,7 +901,7 @@ struct JackGetInternalClientNameRequest : public JackRequest struct JackGetInternalClientNameResult : public JackResult { - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; JackGetInternalClientNameResult(): JackResult() {} @@ -936,7 +936,7 @@ struct JackInternalClientHandleRequest : public JackRequest { int fRefNum; - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; JackInternalClientHandleRequest() {} @@ -1010,9 +1010,9 @@ struct JackInternalClientLoadRequest : public JackRequest #endif int fRefNum; - char fName[JACK_CLIENT_NAME_SIZE + 1]; - char fDllName[MAX_PATH + 1]; - char fLoadInitName[JACK_LOAD_INIT_LIMIT + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; + char fDllName[MAX_PATH+1]; + char fLoadInitName[JACK_LOAD_INIT_LIMIT+1]; int fOptions; int fUUID; @@ -1194,7 +1194,7 @@ struct JackClientNotificationRequest : public JackRequest struct JackSessionCommand { char fUUID[JACK_UUID_SIZE]; - char fClientName[JACK_CLIENT_NAME_SIZE + 1]; + char fClientName[JACK_CLIENT_NAME_SIZE+1]; char fCommand[JACK_SESSION_COMMAND_SIZE]; jack_session_flags_t fFlags; @@ -1305,8 +1305,8 @@ struct JackSessionNotifyResult : public JackResult struct JackSessionNotifyRequest : public JackRequest { - char fPath[JACK_MESSAGE_SIZE + 1]; - char fDst[JACK_CLIENT_NAME_SIZE + 1]; + char fPath[JACK_MESSAGE_SIZE+1]; + char fDst[JACK_CLIENT_NAME_SIZE+1]; jack_session_event_type_t fEventType; int fRefNum; @@ -1377,7 +1377,7 @@ struct JackSessionReplyRequest : public JackRequest struct JackClientNameResult : public JackResult { - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; JackClientNameResult(): JackResult() {} @@ -1433,7 +1433,7 @@ struct JackUUIDResult : public JackResult struct JackGetUUIDRequest : public JackRequest { - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; JackGetUUIDRequest() {} @@ -1496,7 +1496,7 @@ struct JackGetClientNameRequest : public JackRequest struct JackReserveNameRequest : public JackRequest { int fRefNum; - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; char fUUID[JACK_UUID_SIZE]; JackReserveNameRequest() @@ -1533,7 +1533,7 @@ struct JackReserveNameRequest : public JackRequest struct JackClientHasSessionCallbackRequest : public JackRequest { - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; JackClientHasSessionCallbackRequest() {} @@ -1569,13 +1569,13 @@ struct JackClientHasSessionCallbackRequest : public JackRequest struct JackClientNotification { int fSize; - char fName[JACK_CLIENT_NAME_SIZE + 1]; + char fName[JACK_CLIENT_NAME_SIZE+1]; int fRefNum; int fNotify; int fValue1; int fValue2; int fSync; - char fMessage[JACK_MESSAGE_SIZE + 1]; + char fMessage[JACK_MESSAGE_SIZE+1]; JackClientNotification(): fNotify(-1), fValue1(-1), fValue2(-1) {} diff --git a/common/shm.c b/common/shm.c index c52dfa50..75075743 100644 --- a/common/shm.c +++ b/common/shm.c @@ -119,7 +119,7 @@ static jack_shm_info_t registry_info = { /* SHM info for the registry */ /* pointers to registry header and array */ static jack_shm_header_t *jack_shm_header = NULL; static jack_shm_registry_t *jack_shm_registry = NULL; -static char jack_shm_server_prefix[JACK_SERVER_NAME_SIZE] = ""; +static char jack_shm_server_prefix[JACK_SERVER_NAME_SIZE+1] = ""; /* jack_shm_lock_registry() serializes updates to the shared memory * segment JACK uses to keep track of the SHM segments allocated to diff --git a/common/shm.h b/common/shm.h index 92aa5a64..12f0f228 100644 --- a/common/shm.h +++ b/common/shm.h @@ -123,7 +123,7 @@ extern "C" pid_t pid; /* process ID */ #endif - char name[JACK_SERVER_NAME_SIZE]; + char name[JACK_SERVER_NAME_SIZE+1]; } jack_shm_server_t; diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 508a0d17..62d9f43b 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -116,8 +116,8 @@ int JackAlsaDriver::Attach() JackPort* port; jack_port_id_t port_index; unsigned long port_flags = (unsigned long)CaptureDriverFlags; - char name[REAL_JACK_PORT_NAME_SIZE]; - char alias[REAL_JACK_PORT_NAME_SIZE]; + char name[REAL_JACK_PORT_NAME_SIZE+1]; + char alias[REAL_JACK_PORT_NAME_SIZE+1]; assert(fCaptureChannels < DRIVER_PORT_NUM); assert(fPlaybackChannels < DRIVER_PORT_NUM); diff --git a/linux/alsarawmidi/JackALSARawMidiPort.h b/linux/alsarawmidi/JackALSARawMidiPort.h index 91c2522d..0770a8a6 100644 --- a/linux/alsarawmidi/JackALSARawMidiPort.h +++ b/linux/alsarawmidi/JackALSARawMidiPort.h @@ -31,12 +31,12 @@ namespace Jack { private: - char alias[REAL_JACK_PORT_NAME_SIZE]; + char alias[REAL_JACK_PORT_NAME_SIZE+1]; struct pollfd *alsa_poll_fds; int alsa_poll_fd_count; int fds[2]; unsigned short io_mask; - char name[REAL_JACK_PORT_NAME_SIZE]; + char name[REAL_JACK_PORT_NAME_SIZE+1]; struct pollfd *queue_poll_fd; protected: diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj index b0c20e37..cbd2ba01 100644 --- a/macosx/Jackdmp.xcodeproj/project.pbxproj +++ b/macosx/Jackdmp.xcodeproj/project.pbxproj @@ -2029,7 +2029,7 @@ 4BF8D2470834F20600C94B91 /* testSem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = testSem.cpp; path = ../tests/testSem.cpp; sourceTree = SOURCE_ROOT; }; 4BF8FB0D08AC88EF00D1A344 /* JackFrameTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFrameTimer.cpp; path = ../common/JackFrameTimer.cpp; sourceTree = SOURCE_ROOT; }; 4BF8FB0E08AC88EF00D1A344 /* JackFrameTimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFrameTimer.h; path = ../common/JackFrameTimer.h; sourceTree = SOURCE_ROOT; }; - 4BFA5E980DEC4D9C00FA4CDB /* testSem */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testSem; sourceTree = BUILT_PRODUCTS_DIR; }; + 4BFA5E980DEC4D9C00FA4CDB /* testMutex */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testMutex; sourceTree = BUILT_PRODUCTS_DIR; }; 4BFA5E9E0DEC4DD900FA4CDB /* testMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testMutex.cpp; path = ../tests/testMutex.cpp; sourceTree = SOURCE_ROOT; }; 4BFA828C0DF6A9E40087B4E1 /* jack_evmon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_evmon; sourceTree = BUILT_PRODUCTS_DIR; }; 4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_bufsize; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2837,7 +2837,7 @@ 4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */, 4B363F350DEB0BD1001F72D9 /* jack_showtime */, 4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */, - 4BFA5E980DEC4D9C00FA4CDB /* testSem */, + 4BFA5E980DEC4D9C00FA4CDB /* testMutex */, 4BFA828C0DF6A9E40087B4E1 /* jack_evmon */, 4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */, 4BFA82AB0DF6A9E40087B4E1 /* jack_rec */, @@ -6200,7 +6200,7 @@ name = "testMutex Universal"; productInstallPath = /usr/local/bin; productName = testSem; - productReference = 4BFA5E980DEC4D9C00FA4CDB /* testSem */; + productReference = 4BFA5E980DEC4D9C00FA4CDB /* testMutex */; productType = "com.apple.product-type.tool"; }; 4BFA82820DF6A9E40087B4E1 /* jack_evmon 64 bits */ = { diff --git a/macosx/coreaudio/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp index f6bc5f0d..d9448030 100644 --- a/macosx/coreaudio/JackCoreAudioDriver.cpp +++ b/macosx/coreaudio/JackCoreAudioDriver.cpp @@ -2262,8 +2262,8 @@ int JackCoreAudioDriver::Attach() UInt32 size; Boolean isWritable; char channel_name[64]; - char name[REAL_JACK_PORT_NAME_SIZE]; - char alias[REAL_JACK_PORT_NAME_SIZE]; + char name[REAL_JACK_PORT_NAME_SIZE+1]; + char alias[REAL_JACK_PORT_NAME_SIZE+1]; jack_log("JackCoreAudioDriver::Attach : fBufferSize %ld fSampleRate %ld", fEngineControl->fBufferSize, fEngineControl->fSampleRate); diff --git a/macosx/coremidi/JackCoreMidiPort.cpp b/macosx/coremidi/JackCoreMidiPort.cpp index 2bc4eb66..67367923 100644 --- a/macosx/coremidi/JackCoreMidiPort.cpp +++ b/macosx/coremidi/JackCoreMidiPort.cpp @@ -70,7 +70,7 @@ JackCoreMidiPort::Initialize(const char *alias_name, const char *client_name, const char *driver_name, int index, MIDIEndpointRef endpoint, bool is_output) { - char endpoint_name[REAL_JACK_PORT_NAME_SIZE]; + char endpoint_name[REAL_JACK_PORT_NAME_SIZE+1]; CFStringRef endpoint_name_ref; int num = index + 1; Boolean res; diff --git a/macosx/coremidi/JackCoreMidiPort.h b/macosx/coremidi/JackCoreMidiPort.h index 3cb7b60b..6b132f2c 100644 --- a/macosx/coremidi/JackCoreMidiPort.h +++ b/macosx/coremidi/JackCoreMidiPort.h @@ -31,9 +31,9 @@ namespace Jack { private: - char alias[REAL_JACK_PORT_NAME_SIZE]; + char alias[REAL_JACK_PORT_NAME_SIZE+1]; + char name[REAL_JACK_PORT_NAME_SIZE+1]; bool initialized; - char name[REAL_JACK_PORT_NAME_SIZE]; protected: diff --git a/solaris/oss/JackOSSAdapter.h b/solaris/oss/JackOSSAdapter.h index d96bdd6a..4c5eba02 100644 --- a/solaris/oss/JackOSSAdapter.h +++ b/solaris/oss/JackOSSAdapter.h @@ -55,8 +55,8 @@ class JackOSSAdapter : public JackAudioAdapterInterface, public JackRunnableInte JackThread fThread; - char fCaptureDriverName[JACK_CLIENT_NAME_SIZE + 1]; - char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE + 1]; + char fCaptureDriverName[JACK_CLIENT_NAME_SIZE+1]; + char fPlaybackDriverName[JACK_CLIENT_NAME_SIZE+1]; int fInFD; int fOutFD; diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h index 54858853..e625565f 100644 --- a/windows/JackWinNamedPipeServerChannel.h +++ b/windows/JackWinNamedPipeServerChannel.h @@ -80,7 +80,7 @@ class JackWinNamedPipeServerChannel : public JackRunnableInterface JackWinNamedPipeServer fRequestListenPipe; // Pipe to create request socket for the client JackServer* fServer; JackThread fThread; // Thread to execute the event loop - char fServerName[JACK_SERVER_NAME_SIZE]; + char fServerName[JACK_SERVER_NAME_SIZE+1]; std::list<JackClientPipeThread*> fClientList; diff --git a/windows/winmme/JackWinMMEPort.h b/windows/winmme/JackWinMMEPort.h index a544c4a6..882db7f9 100644 --- a/windows/winmme/JackWinMMEPort.h +++ b/windows/winmme/JackWinMMEPort.h @@ -31,8 +31,8 @@ namespace Jack { protected: - char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE]; - char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE]; + char alias[REAL_JACK_PORT_NAME_SIZE+1]; + char name[REAL_JACK_PORT_NAME_SIZE+1]; public: |