From d1aa200e45bc6cff1673728bddfca86cbd643fe6 Mon Sep 17 00:00:00 2001 From: Philippe PITTOLI Date: Sat, 10 Sep 2016 17:16:39 +0200 Subject: [PATCH 1/2] pubsubd: problem spotted -- fix soon --- lib/communication.c | 7 ++++++- lib/pubsubd.c | 33 ++++++++++++++++++++++++--------- pubsub/test-gen-new-process.c | 4 +++- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/lib/communication.c b/lib/communication.c index 31f41a9..fc539e3 100644 --- a/lib/communication.c +++ b/lib/communication.c @@ -19,13 +19,18 @@ int file_write (const char *path, const char *buf, size_t msize) int file_read (const char *path, char **buf, size_t *msize) { + if (buf == NULL) + return -1; + int fd = open (path, O_RDONLY); if (fd <= 0) { return ER_FILE_OPEN; } - if (*buf == NULL) + if (*buf == NULL) { *buf = malloc (BUFSIZ); + memset (*buf, 0, BUFSIZ); + } int ret = 0; int ret2 = 0; diff --git a/lib/pubsubd.c b/lib/pubsubd.c index d1619dd..8d0e0b4 100644 --- a/lib/pubsubd.c +++ b/lib/pubsubd.c @@ -59,6 +59,7 @@ struct channel * pubsubd_channel_copy (struct channel *c) memcpy (copy, c, sizeof(struct channel)); if (c->chan != NULL) { + printf ("COPY CHAN : %d\n", c->chanlen); copy->chan = malloc (c->chanlen); memset (copy->chan, 0, c->chanlen); memcpy (copy->chan, c->chan, c->chanlen); @@ -78,8 +79,10 @@ int pubsubd_channel_new (struct channel *c, const char * name) printf ("NAME : %s, SIZE : %ld\n", name, nlen); - if (c->chan == NULL) + if (c->chan == NULL) { c->chan = malloc (nlen +1); + memset (c->chan, 0, nlen +1); + } memset (c->chan, 0, nlen +1); memcpy (c->chan, name, nlen); @@ -126,8 +129,10 @@ void pubsubd_subscriber_init (struct app_list_head **chans) { if (chans == NULL) return; - if (*chans == NULL) + if (*chans == NULL) { *chans = malloc (sizeof(struct channels)); + memset (*chans, 0, sizeof(struct channels)); + } LIST_INIT(*chans); } @@ -149,12 +154,7 @@ void pubsubd_channel_print (const struct channel *c) if (c == NULL || c->chan == NULL) return; - if (c->chan == NULL) { - printf ( "\033[32mchan name not available\033[00m\n"); - } - else { - printf ( "\033[32mchan %s\033[00m\n", c->chan); - } + printf ( "\033[32mchan %s\033[00m\n", c->chan); if (c->alh == NULL) return; @@ -173,6 +173,7 @@ struct app_list_elm * pubsubd_app_list_elm_copy (const struct app_list_elm *ale) struct app_list_elm * n = NULL; n = malloc (sizeof (struct app_list_elm)); + memset (n, 0, sizeof (struct app_list_elm)); if (ale->p != NULL) n->p = srv_process_copy (ale->p); @@ -248,6 +249,9 @@ void pubsubd_app_list_elm_create (struct app_list_elm *ale, struct process *p) if (ale == NULL) return; + if (ale->p != NULL) + free (ale->p); + ale->p = srv_process_copy (p); } @@ -273,6 +277,7 @@ void pubsubd_msg_serialize (const struct pubsub_msg *msg, char **data, size_t *l *data = NULL; } *data = malloc(*len); + memset (*data, 0, *len); data[0][0] = msg->type; return; } @@ -286,6 +291,7 @@ void pubsubd_msg_serialize (const struct pubsub_msg *msg, char **data, size_t *l *data = NULL; } *data = malloc(*len); + memset (*data, 0, *len); size_t i = 0; @@ -334,6 +340,7 @@ void pubsubd_msg_unserialize (struct pubsub_msg *msg, const char *data, size_t l return; } msg->chan = malloc (msg->chanlen); + memset (msg->chan, 0, msg->chanlen); memcpy (msg->chan, data + i, msg->chanlen); i += msg->chanlen; memcpy (&msg->datalen, data + i, sizeof(size_t)); i += sizeof(size_t); @@ -342,6 +349,7 @@ void pubsubd_msg_unserialize (struct pubsub_msg *msg, const char *data, size_t l return; } msg->data = malloc (msg->datalen); + memset (msg->data, 0, msg->datalen); memcpy (msg->data, data + i, msg->datalen); i += msg->datalen; } @@ -389,9 +397,15 @@ int pubsubd_get_new_process (const char *spath, struct app_list_elm *ale char chan[BUFSIZ]; memset (chan, 0, BUFSIZ); + if (buf == NULL) { + return -2; + } + printf ("INIT: %s\n", buf); for (str = buf, i = 1; ; str = NULL, i++) { + if (str == NULL) + break; token = strtok_r(str, " ", &saveptr); if (token == NULL) break; @@ -441,16 +455,17 @@ int pubsubd_get_new_process (const char *spath, struct app_list_elm *ale } ale->p = malloc (sizeof (struct process)); + memset (ale->p, 0, sizeof (struct process)); srv_process_gen (ale->p, pid, index, version); if (*c == NULL) { *c = malloc (sizeof (struct channel)); + memset (*c, 0, sizeof (struct channel)); } chan[BUFSIZ -1] = '\0'; pubsubd_channel_new (*c, chan); - struct channel *new_chan = NULL; new_chan = pubsubd_channel_get (chans, *c); if (new_chan == NULL) { diff --git a/pubsub/test-gen-new-process.c b/pubsub/test-gen-new-process.c index 6999ac1..cc2f733 100644 --- a/pubsub/test-gen-new-process.c +++ b/pubsub/test-gen-new-process.c @@ -27,7 +27,7 @@ main(int argc, char **argv) struct channels chans; memset (&chans, 0, sizeof (struct channels)); - for (int nb = 10, i = 0 ; nb > 0; i++, nb--) { + for (int nb = 1, i = 0 ; nb > 0; i++, nb--) { struct app_list_elm ale; memset (&ale, 0, sizeof (struct app_list_elm)); @@ -42,6 +42,8 @@ main(int argc, char **argv) pubsubd_channels_print (&chans); printf ("--\n"); printf ("still %d remaining processes\n", nb); + + pubsubd_app_list_elm_free (&ale); } pubsubd_channels_del_all (&chans); From 6b2f53aee4e9c2b946706aab1d5c19459b6ff268 Mon Sep 17 00:00:00 2001 From: Philippe PITTOLI Date: Sat, 10 Sep 2016 17:29:50 +0200 Subject: [PATCH 2/2] =?UTF-8?q?process=20:=20retour=20=C3=A0=20la=20versio?= =?UTF-8?q?n=20correcte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/process.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/lib/process.c b/lib/process.c index 426cd73..307405b 100644 --- a/lib/process.c +++ b/lib/process.c @@ -29,20 +29,6 @@ void srv_process_gen (struct process *p snprintf(p->path_in , PATH_MAX, "%s%d-%d-in" , TMPDIR, pid, index); snprintf(p->path_out, PATH_MAX, "%s%d-%d-out", TMPDIR, pid, index); - //printf("path-in : %s\n", p->path_in ); - //printf("path-out : %s\n", p->path_out ); - - p->in = NULL; - p->out = NULL; -} - -void srv_process_free (struct process * p) -{ - // TODO nothing to do now - - snprintf(p->path_in , PATH_MAX, "%s/%d-%d-in" , TMPDIR, pid, index); - snprintf(p->path_out, PATH_MAX, "%s/%d-%d-out", TMPDIR, pid, index); - } void srv_process_print (struct process *p)