[Commit-gnuradio] [gnuradio] 03/09: Fix: out-of-bounds memset

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 9ac802560be1cab3601c74a9ad2af96118d8ea6f
Author: Marcus Müller <address@hidden>
Date:   Mon Apr 6 10:16:40 2015 +0200

    Fix: out-of-bounds memset
    
    Ron says:
    
    >Marcus,
    >
    >Looks like a copy and paste bug. I must have copied line 1149:
    >
    >int plen = FRAME_SIZE_SHORT - NBCH_1_4;
    >
    >from the previous function add_l1pre().
    >
    >So the fix would be to change line 1324 to:
    >
    >int plen = FRAME_SIZE_SHORT - NBCH_1_2;
---
 gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc 
b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
index c3702e0..a09af90 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
@@ -1321,7 +1321,7 @@ namespace gr {
       int temp, offset_bits = 0;
       unsigned char b, value;
       unsigned int shift[6];
-      int plen = FRAME_SIZE_SHORT - NBCH_1_4;
+      int plen = FRAME_SIZE_SHORT - NBCH_1_2;
       const unsigned char *d;
       unsigned char *p;
       unsigned char *l1post = l1_interleave;