<div dir="ltr">Merged in both master and stable-2.6, thanks!<div><br></div><div>Jérémie</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Apr 28, 2015 at 5:09 PM, Philippe Proulx <span dir="ltr"><<a href="mailto:eeppeliteloop@gmail.com" target="_blank">eeppeliteloop@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Reported-by: Hannes Weisbach <<a href="mailto:hannes.weisbach@mailbox.tu-dresden.de">hannes.weisbach@mailbox.tu-dresden.de</a>><br>
Signed-off-by: Philippe Proulx <<a href="mailto:eeppeliteloop@gmail.com">eeppeliteloop@gmail.com</a>><br>
---<br>
src/bin/lttng-sessiond/modprobe.c | 8 ++++----<br>
1 file changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c<br>
index d730a1d..32c4210 100644<br>
--- a/src/bin/lttng-sessiond/modprobe.c<br>
+++ b/src/bin/lttng-sessiond/modprobe.c<br>
@@ -360,11 +360,11 @@ static int append_list_to_probes(const char *list)<br>
{<br>
char *next;<br>
int index = nr_probes, ret;<br>
- char *tmp_list;<br>
+ char *tmp_list, *cur_list;<br>
<br>
assert(list);<br>
<br>
- tmp_list = strdup(list);<br>
+ cur_list = tmp_list = strdup(list);<br>
if (!tmp_list) {<br>
PERROR("strdup temp list");<br>
return -ENOMEM;<br>
@@ -374,11 +374,11 @@ static int append_list_to_probes(const char *list)<br>
size_t name_len;<br>
struct kern_modules_param *cur_mod;<br>
<br>
- next = strtok(tmp_list, ",");<br>
+ next = strtok(cur_list, ",");<br>
if (!next) {<br>
break;<br>
}<br>
- tmp_list = NULL;<br>
+ cur_list = NULL;<br>
<br>
/* filter leading spaces */<br>
while (*next == ' ') {<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.3.0<br>
<br>
<br>
_______________________________________________<br>
lttng-dev mailing list<br>
<a href="mailto:lttng-dev@lists.lttng.org">lttng-dev@lists.lttng.org</a><br>
<a href="http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev" target="_blank">http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature">Jérémie Galarneau<br>EfficiOS Inc.<br><a href="http://www.efficios.com" target="_blank">http://www.efficios.com</a></div>
</div>