Commit 02f74a65 authored by Stephane Letz's avatar Stephane Letz
Browse files

String management fix.

parent f3cf9d6f
......@@ -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
......
......@@ -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;
......
......@@ -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)
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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...
......
......@@ -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 ?
......
......@@ -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
......
......@@ -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;
......
......@@ -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 */
......
......@@ -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)
{}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment