Fixed completely buggy memcopy that overwrote potentially lots of memory in

atsc_depad.cc.  The problem has to do with confusion between input and output
sizes, as well as some very wrong pointer math (Dan Halperin).

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8298 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-atsc/src/lib/atsc_depad.cc b/gr-atsc/src/lib/atsc_depad.cc
index 00df58f50312246e60a7b74b922115d70908b6c4..c72067e6116718a7933d36dae2750ea35366f704 100644 (file)
--- a/gr-atsc/src/lib/atsc_depad.cc
+++ b/gr-atsc/src/lib/atsc_depad.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
  * 
@@ -28,8 +28,6 @@
 #include <gr_io_signature.h>
 #include <atsc_types.h>
 
-static const int INTR = ATSC_MPEG_PKT_LENGTH;
-
 atsc_depad_sptr
 atsc_make_depad()
 {
@@ -38,43 +36,26 @@ atsc_make_depad()
 
 atsc_depad::atsc_depad()
   : gr_sync_interpolator("atsc_depad",
-                 gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)),
-                 gr_make_io_signature(1, 1, sizeof(unsigned char)),
-                 INTR)
+                        gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)),
+                        gr_make_io_signature(1, 1, sizeof(unsigned char)),
+                        ATSC_MPEG_PKT_LENGTH)
 {
   reset();
 }
 
-void
-atsc_depad::forecast (int noutput_items, gr_vector_int &ninput_items_required)
-{
-  unsigned ninputs = ninput_items_required.size();
-  for (unsigned i = 0; i < ninputs; i++) 
-    ninput_items_required[i] = noutput_items / ATSC_MPEG_PKT_LENGTH;
-}
-
-
 int
 atsc_depad::work (int noutput_items,
-                      gr_vector_const_void_star &input_items,
-                      gr_vector_void_star &output_items)
+                 gr_vector_const_void_star &input_items,
+                 gr_vector_void_star &output_items)
 {
   const atsc_mpeg_packet *in = (const atsc_mpeg_packet *) input_items[0];
   unsigned char *out = (unsigned char *) output_items[0];
 
-  // size with padding (256)
-  unsigned int ATSC_MPEG_PKT = sizeof(atsc_mpeg_packet);
   unsigned int i;
 
-  for (i = 0; i < noutput_items/ATSC_MPEG_PKT + 1; i++){
-    for (int j = 0; j < ATSC_MPEG_PKT_LENGTH; j++)
-       out[i * ATSC_MPEG_PKT_LENGTH + j] = in[i * ATSC_MPEG_PKT].data[j];
-
+  for (i = 0; i < noutput_items/ATSC_MPEG_PKT_LENGTH; i++){
+    memcpy(&out[i * ATSC_MPEG_PKT_LENGTH], in[i].data, ATSC_MPEG_PKT_LENGTH);
   }
 
   return i * ATSC_MPEG_PKT_LENGTH;
 }
-
-
-
-

diff --git a/gr-atsc/src/lib/atsc_depad.h b/gr-atsc/src/lib/atsc_depad.h
index 378f1d133debe42d92535b3dcf79e6c380581916..58dfdaf62d054694afeb14237db76053cb4b0397 100644 (file)
--- a/gr-atsc/src/lib/atsc_depad.h
+++ b/gr-atsc/src/lib/atsc_depad.h
@@ -30,8 +30,7 @@ typedef boost::shared_ptr<atsc_depad> atsc_depad_sptr;
 atsc_depad_sptr atsc_make_depad();
 
 /*!
- * \brief depad mpeg ts packets from 256 byte atsc_mpeg_packet
- * to 188 byte char
+ * \brief depad mpeg ts packets from 256 byte atsc_mpeg_packet to 188 byte char
  * \ingroup atsc
  *
  * input: atsc_mpeg_packet; output: unsigned char
@@ -43,7 +42,6 @@ class atsc_depad : public gr_sync_interpolator
   atsc_depad();
 
 public:
-  void forecast (int noutput_items, gr_vector_int &ninput_items_required);
   int work (int noutput_items,
            gr_vector_const_void_star &input_items,
            gr_vector_void_star &output_items);