<div dir="ltr"><div>Merged, thanks!<br><br></div>Jérémie<br></div><div class="gmail_extra"><br><div class="gmail_quote">On 30 April 2018 at 14:27, Jonathan Rajotte <span dir="ltr"><<a href="mailto:jonathan.rajotte-julien@efficios.com" target="_blank">jonathan.rajotte-julien@efficios.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">sample_channel_positions return garbage if cds_lfht_is_node_deleted(&<wbr>stream->node.node)<br>
on first and "possibly" only iteration of the consumer_data.stream_per_chan_<wbr>id_ht<br>
hash table.<br>
<br>
Found by scan-build<br>
<br>
Signed-off-by: Jonathan Rajotte <<a href="mailto:jonathan.rajotte-julien@efficios.com">jonathan.rajotte-julien@<wbr>efficios.com</a>><br>
---<br>
 src/common/consumer/consumer-<wbr>timer.c | 2 +-<br>
 1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/src/common/consumer/<wbr>consumer-timer.c b/src/common/consumer/<wbr>consumer-timer.c<br>
index 721f146e..38b8b30d 100644<br>
--- a/src/common/consumer/<wbr>consumer-timer.c<br>
+++ b/src/common/consumer/<wbr>consumer-timer.c<br>
@@ -637,7 +637,7 @@ int sample_channel_positions(<wbr>struct lttng_consumer_channel *channel,<br>
                sample_positions_cb sample, get_consumed_cb get_consumed,<br>
                get_produced_cb get_produced)<br>
 {<br>
-       int ret;<br>
+       int ret = 0;<br>
        struct lttng_ht_iter iter;<br>
        struct lttng_consumer_stream *stream;<br>
        bool empty_channel = true;<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.17.0<br>
<br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="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>