Merged in both master and stable-2.6, thanks! Jérémie
On Tue, Apr 28, 2015 at 5:09 PM, Philippe Proulx <eeppelitel...@gmail.com> wrote: > Reported-by: Hannes Weisbach <hannes.weisb...@mailbox.tu-dresden.de> > Signed-off-by: Philippe Proulx <eeppelitel...@gmail.com> > --- > src/bin/lttng-sessiond/modprobe.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/bin/lttng-sessiond/modprobe.c > b/src/bin/lttng-sessiond/modprobe.c > index d730a1d..32c4210 100644 > --- a/src/bin/lttng-sessiond/modprobe.c > +++ b/src/bin/lttng-sessiond/modprobe.c > @@ -360,11 +360,11 @@ static int append_list_to_probes(const char *list) > { > char *next; > int index = nr_probes, ret; > - char *tmp_list; > + char *tmp_list, *cur_list; > > assert(list); > > - tmp_list = strdup(list); > + cur_list = tmp_list = strdup(list); > if (!tmp_list) { > PERROR("strdup temp list"); > return -ENOMEM; > @@ -374,11 +374,11 @@ static int append_list_to_probes(const char *list) > size_t name_len; > struct kern_modules_param *cur_mod; > > - next = strtok(tmp_list, ","); > + next = strtok(cur_list, ","); > if (!next) { > break; > } > - tmp_list = NULL; > + cur_list = NULL; > > /* filter leading spaces */ > while (*next == ' ') { > -- > 2.3.0 > > > _______________________________________________ > lttng-dev mailing list > lttng-dev@lists.lttng.org > http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com
_______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev