diff options
| author | Thomas Habets <habets@google.com> | 2021-03-16 17:06:17 +0000 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-03-16 15:14:39 -0400 |
| commit | dd91a45d922c299004cc2d6027a9a8fea248e1aa (patch) | |
| tree | 5c0d81cfd54a062d3342eb90c9efe4e14640edd9 | |
| parent | f4fc23b362252d23d3d11c3f7f5bd21f5292c271 (diff) | |
qtgui: Fix segfaulting overflow in waterfall
Fixes #4402
Signed-off-by: Thomas Habets <habets@google.com>
| -rw-r--r-- | gr-qtgui/lib/waterfall_sink_c_impl.cc | 39 | ||||
| -rw-r--r-- | gr-qtgui/lib/waterfall_sink_c_impl.h | 1 | ||||
| -rw-r--r-- | gr-qtgui/lib/waterfall_sink_f_impl.cc | 40 | ||||
| -rw-r--r-- | gr-qtgui/lib/waterfall_sink_f_impl.h | 1 |
4 files changed, 46 insertions, 35 deletions
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index 3ca73c343a..039a22dfb1 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -61,17 +61,12 @@ waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize, d_port(pmt::mp("freq")), d_port_bw(pmt::mp("bw")), d_fft(std::make_unique<fft::fft_complex_fwd>(fftsize)), + d_residbufs(d_nconnections + 1), // One extra "connection" for the PDU memory. + d_magbufs(d_nconnections + 1), // One extra "connection" for the PDU memory. d_fbuf(fftsize), d_parent(parent) { - // save the last "connection" for the PDU memory - for (int i = 0; i < d_nconnections + 1; i++) { - d_residbufs.emplace_back(d_fftsize); - d_magbufs.emplace_back(d_fftsize); - } - - d_residbufs.emplace_back(d_fftsize); - d_pdu_magbuf = d_magbufs[d_magbufs.size() - 1].data(); + resize_bufs(d_fftsize); buildwindow(); @@ -303,6 +298,24 @@ void waterfall_sink_c_impl::buildwindow() } } +void waterfall_sink_c_impl::resize_bufs(int size) +{ + // Resize residbuf and replace data. + for (auto& buf : d_residbufs) { + buf.clear(); + buf.resize(size); + } + for (auto& mag : d_magbufs) { + mag.clear(); + mag.resize(size); + } + + // Expand PDU buffer to required size. + auto& last_magbuf = d_magbufs[d_magbufs.size() - 1]; + last_magbuf.resize(size * d_nrows); + d_pdu_magbuf = last_magbuf.data(); +} + void waterfall_sink_c_impl::fftresize() { gr::thread::scoped_lock lock(d_setlock); @@ -311,15 +324,7 @@ void waterfall_sink_c_impl::fftresize() d_fftavg = d_main_gui->getFFTAverage(); if (newfftsize != d_fftsize) { - - // Resize residbuf and replace data - for (int i = 0; i < d_nconnections + 1; i++) { - d_residbufs[i].clear(); - d_residbufs[i].resize(newfftsize); - d_magbufs[i].clear(); - d_magbufs[i].resize(newfftsize); - } - d_pdu_magbuf = d_magbufs[d_magbufs.size() - 1].data(); + resize_bufs(newfftsize); // Set new fft size and reset buffer index // (throws away any currently held data, but who cares?) diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index a4b03ff689..27f4473f6c 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -70,6 +70,7 @@ private: void windowreset(); void buildwindow(); void fftresize(); + void resize_bufs(int size); void check_clicked(); void fft(float* data_out, const gr_complex* data_in, int size); diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index d46e58cd56..565c68d150 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -59,17 +59,12 @@ waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize, d_port(pmt::mp("freq")), d_port_bw(pmt::mp("bw")), d_fft(std::make_unique<fft::fft_complex_fwd>(d_fftsize)), + d_residbufs(d_nconnections + 1), // One extra "connection" for the PDU memory. + d_magbufs(d_nconnections + 1), // One extra "connection" for the PDU memory. d_fbuf(fftsize), d_parent(parent) { - // save the last "connection" for the PDU memory - for (int i = 0; i < d_nconnections + 1; i++) { - d_residbufs.emplace_back(d_fftsize); - d_magbufs.emplace_back(d_fftsize); - } - - d_pdu_magbuf = d_magbufs[d_magbufs.size() - 1].data(); - + resize_bufs(d_fftsize); buildwindow(); initialize(); @@ -308,6 +303,24 @@ void waterfall_sink_f_impl::buildwindow() } } +void waterfall_sink_f_impl::resize_bufs(int size) +{ + // Resize residbuf and replace data. + for (auto& buf : d_residbufs) { + buf.clear(); + buf.resize(size); + } + for (auto& mag : d_magbufs) { + mag.clear(); + mag.resize(size); + } + + // Expand PDU buffer to required size. + auto& last_magbuf = d_magbufs[d_magbufs.size() - 1]; + last_magbuf.resize(size * d_nrows); + d_pdu_magbuf = last_magbuf.data(); +} + void waterfall_sink_f_impl::fftresize() { gr::thread::scoped_lock lock(d_setlock); @@ -316,16 +329,7 @@ void waterfall_sink_f_impl::fftresize() d_fftavg = d_main_gui->getFFTAverage(); if (newfftsize != d_fftsize) { - - // Resize residbuf and replace data - for (int i = 0; i < d_nconnections + 1; i++) { - d_residbufs[i].clear(); - d_magbufs[i].clear(); - - d_residbufs[i].resize(newfftsize); - d_magbufs[i].resize(newfftsize); - } - d_pdu_magbuf = d_magbufs[d_magbufs.size() - 1].data(); + resize_bufs(newfftsize); // Set new fft size and reset buffer index // (throws away any currently held data, but who cares?) diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index cd70e20de6..0b697ff9b9 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -70,6 +70,7 @@ private: void windowreset(); void buildwindow(); void fftresize(); + void resize_bufs(int size); void check_clicked(); void fft(float* data_out, const float* data_in, int size); |