summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornldudok12008-02-26 22:34:54 +0000
committernldudok12008-02-26 22:34:54 +0000
commit8779afa30b5b0877d6a7908b3b72f236c444edc4 (patch)
tree8ab335a2beb456fa094e39eb046adc2de5617df7
parent046604dc691ef19e23a4b539df77d17f27f47a20 (diff)
downloadgnuradio-8779afa30b5b0877d6a7908b3b72f236c444edc4.tar.gz
gnuradio-8779afa30b5b0877d6a7908b3b72f236c444edc4.tar.bz2
gnuradio-8779afa30b5b0877d6a7908b3b72f236c444edc4.zip
removed bug in gr_test which could result in segfault when d_sizeof_output_item!=d_sizeof_input_item
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7847 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--gnuradio-core/src/lib/general/gr_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-core/src/lib/general/gr_test.cc b/gnuradio-core/src/lib/general/gr_test.cc
index 25f142ccc..9698c23a7 100644
--- a/gnuradio-core/src/lib/general/gr_test.cc
+++ b/gnuradio-core/src/lib/general/gr_test.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -138,9 +138,9 @@ gr_test::general_work (int noutput_items,
}
}
}
- //Now copy input to output untill max ninputs or max noutputs is reached
+ //Now copy input to output until max ninputs or max noutputs is reached
int common_nports=std::min(ninputs,noutputs);
- if(d_sizeof_output_item==d_sizeof_input_item);
+ if(d_sizeof_output_item==d_sizeof_input_item)
for (int i = 0; i < common_nports; i++)
{
memcpy(output_items[i],input_items[i],noutput_items*d_sizeof_input_item);