X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fconverter.cpp;h=1d7abde785b21aac12f25c80c1bf15eaa23a378b;hb=cc22c89b2362f14e18d8d8ef2b736800592cfd1a;hp=f790fc00ef6b8e4c1371d2d54eb8ea24789f3de3;hpb=03a4775eefeeba913f69d331e3930700a567c4c5;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/utils/converter.cpp b/low-can-binding/utils/converter.cpp
index f790fc00..1d7abde7 100644
--- a/low-can-binding/utils/converter.cpp
+++ b/low-can-binding/utils/converter.cpp
@@ -32,7 +32,7 @@ std::string converter_t::to_hex(const uint8_t data[], const size_t length)
 	std::stringstream stream;
 	stream << std::hex << std::setfill('0');
 	for(int i = 0; i < length; i++)
-		stream << std::hex << ((int) data[i]);
+		stream << std::setfill('0') << std::setw(2) << std::hex << ((int) data[i]);
 
 	return stream.str();
 }
@@ -48,7 +48,7 @@ std::string converter_t::to_hex(const uint8_t data[], const size_t length)
  * @param new_start_bit The first bit of the signal in the frame
  * @param new_end_bit The last bit of the signal in the frame
  */
-void converter_t::signal_to_bits_bytes(uint32_t bit_position, uint32_t bit_size, int &new_start_byte, int &new_end_byte, uint8_t &new_start_bit, uint8_t &new_end_bit)
+void converter_t::signal_to_bits_bytes(unsigned int bit_position, unsigned int bit_size, int &new_start_byte, int &new_end_byte, uint8_t &new_start_bit, uint8_t &new_end_bit)
 {
 	new_start_byte = bit_position >> 3;
 	new_start_bit = bit_position % 8;
@@ -69,6 +69,13 @@ uint32_t converter_t::bit_position_swap(uint32_t bit_position,uint32_t bit_size)
 {
 	uint32_t start_byte_position = (uint32_t)(bit_position/8);
 	uint32_t bit_size_rest = bit_size;
+
+	if((int)(bit_size-(8 + start_byte_position*8-bit_position%8))>0)
+	{
+		AFB_ERROR("Error: bit_position and bit_size getting out of range");
+		return bit_position;
+	}
+
 	if(bit_size<=8 && ((bit_position+bit_size)%8==bit_size || (bit_position+bit_size)%8==0))
 	{
 		return (uint32_t)(start_byte_position*8 + (8-bit_size));