[Commit-gnuradio] [gnuradio] 09/11: qtgui: Fix SIGSEGV for tag trigger with constellation sink

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit b77e5a6696c098b1f3bbb41507f4f54e3711060b
Author: Andy Walls <address@hidden>
Date:   Sun Jan 8 16:24:37 2017 -0500

    qtgui: Fix SIGSEGV for tag trigger with constellation sink
    
    The tag offset accounting the block tried to do to
    compensate for the 1 history sample, with tag triggering,
    would occasionally generate a -1 for a buffer index,
    causing a SIGSEGV.
    
    Change to straight-forward tag offset accounting, and
    just ignore the 1 history sample for everything
    except auto/normal triggering.
---
 gr-qtgui/lib/const_sink_c_impl.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gr-qtgui/lib/const_sink_c_impl.cc 
b/gr-qtgui/lib/const_sink_c_impl.cc
index 63777d7..7d9a394 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -98,7 +98,6 @@ namespace gr {
       set_trigger_mode(TRIG_MODE_FREE, TRIG_SLOPE_POS, 0, 0);
 
       set_history(2);          // so we can look ahead for the trigger slope
-      declare_sample_delay(1); // delay the tags for a history of 2
    }
 
     const_sink_c_impl::~const_sink_c_impl()
@@ -439,7 +438,7 @@ namespace gr {
       if(tags.size() > 0) {
         d_triggered = true;
         trigger_index = tags[0].offset - nr;
-        d_start = d_index + trigger_index - 1;
+        d_start = d_index + trigger_index;
         d_end = d_start + d_size;
         d_trigger_count = 0;
       }
@@ -516,7 +515,7 @@ namespace gr {
         in = (const gr_complex*)input_items[n];
         volk_32fc_deinterleave_64f_x2(&d_residbufs_real[n][d_index],
                                       &d_residbufs_imag[n][d_index],
-                                      &in[0], nitems);
+                                      &in[history()-1], nitems);
       }
       d_index += nitems;