bug fixes of earlier bug fixes

Conflicts:
	openair1/PHY/CODING/ldpc_encoder.c

openair1/PHY/CODING/ldpc_encoder.c

@@ -5300,8 +5300,8 @@ int ldpc_encoder(unsigned char *test_input,unsigned char *channel_input,short bl
   //printf("%d\n",no_punctured_columns);
   //printf("%d\n",removed_bit);
   // unpack input
-  memset(c,0,sizeof(uint16_t) * ncols * Zc);
-  memset(d,0,sizeof(uint16_t) * ncols * Zc * 3);
+  memset(c,0,sizeof(unsigned char) * ncols * Zc);
+  memset(d,0,sizeof(unsigned char) * nrows * Zc);
 
   for (i=0; i<block_length; i++)
   {