Change-Id: I14a97a7fdd000da62d2ed4bea71f55ee34a21311
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
if (CLIB_DEBUG > 1)
clib_warning ("[%d] creating segment '%s'", getpid (), ssvm->name);
if (CLIB_DEBUG > 1)
clib_warning ("[%d] creating segment '%s'", getpid (), ssvm->name);
+ ASSERT (vec_c_string_is_terminated (ssvm->name));
ssvm_filename = format (0, "/dev/shm/%s%c", ssvm->name, 0);
unlink ((char *) ssvm_filename);
ssvm_filename = format (0, "/dev/shm/%s%c", ssvm->name, 0);
unlink ((char *) ssvm_filename);
int ssvm_fd = -1;
ssvm_shared_header_t *sh;
int ssvm_fd = -1;
ssvm_shared_header_t *sh;
+ ASSERT (vec_c_string_is_terminated (ssvm->name));
ssvm->i_am_master = 0;
while (timeout_in_seconds-- > 0)
ssvm->i_am_master = 0;
while (timeout_in_seconds-- > 0)
s->ssvm.ssvm_size = a->segment_size;
s->ssvm.i_am_master = 1;
s->ssvm.my_pid = getpid ();
s->ssvm.ssvm_size = a->segment_size;
s->ssvm.i_am_master = 1;
s->ssvm.my_pid = getpid ();
- s->ssvm.name = format (0, "%s", a->segment_name);
+ s->ssvm.name = format (0, "%s%c", a->segment_name, 0);
s->ssvm.requested_va = sm->next_baseva;
rv = ssvm_master_init (&s->ssvm, s - sm->segments);
s->ssvm.requested_va = sm->next_baseva;
rv = ssvm_master_init (&s->ssvm, s - sm->segments);
s->ssvm.ssvm_size = ~0;
s->ssvm.i_am_master = 1;
s->ssvm.my_pid = getpid ();
s->ssvm.ssvm_size = ~0;
s->ssvm.i_am_master = 1;
s->ssvm.my_pid = getpid ();
- s->ssvm.name = (u8 *) a->segment_name;
+ s->ssvm.name = format (0, "%s%c", a->segment_name, 0);
s->ssvm.requested_va = ~0;
/* Allocate a [sic] shared memory header, in process memory... */
s->ssvm.requested_va = ~0;
/* Allocate a [sic] shared memory header, in process memory... */
s->ssvm.ssvm_size = a->segment_size;
s->ssvm.my_pid = getpid ();
s->ssvm.ssvm_size = a->segment_size;
s->ssvm.my_pid = getpid ();
- s->ssvm.name = (u8 *) a->segment_name;
+ s->ssvm.name = format (0, "%s%c", a->segment_name, 0);
s->ssvm.requested_va = sm->next_baseva;
rv = ssvm_slave_init (&s->ssvm, sm->timeout_in_seconds);
s->ssvm.requested_va = sm->next_baseva;
rv = ssvm_slave_init (&s->ssvm, sm->timeout_in_seconds);