sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hex2bin: Fix some indexing errors

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-16 08:37:44 -06:00
parent 7019e782ad
commit 896d1d3f83
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
system/hex2bin/hex2bin.c
View File

@ -338,31 +338,31 @@ static int readstream(FAR struct lib_instream_s *instream,
* Name: hex2bin_swap16 and hex2bin_swap32 * Name: hex2bin_swap16 and hex2bin_swap32
****************************************************************************/ ****************************************************************************/
static inline void hex2bin_swap16(FAR uint8_t *bin, int bytecount) static inline void hex2bin_swap16(FAR uint8_t *data, int bytecount)
{ {
for (; bytecount > 0; bytecount -= 2) for (; bytecount > 0; bytecount -= 2)
{ {
uint8_t b0 = bin[0]; uint8_t b0 = data[0];
uint8_t b1 = bin[1]; uint8_t b1 = data[1];
*bin++ = b1; *data++ = b1;
*bin++ = b0; *data++ = b0;
} }
} }
static inline void hex2bin_swap32(FAR uint8_t *bin, int bytecount) static inline void hex2bin_swap32(FAR uint8_t *data, int bytecount)
{ {
for (; bytecount > 0; bytecount -= 4) for (; bytecount > 0; bytecount -= 4)
{ {
uint8_t b0 = bin[0]; uint8_t b0 = data[0];
uint8_t b1 = bin[1]; uint8_t b1 = data[1];
uint8_t b2 = bin[2]; uint8_t b2 = data[2];
uint8_t b3 = bin[3]; uint8_t b3 = data[3];
*bin++ = b3; *data++ = b3;
*bin++ = b2; *data++ = b2;
*bin++ = b1; *data++ = b1;
*bin++ = b0; *data++ = b0;
} }
} }
@ -371,11 +371,11 @@ static inline void hex2bin_swap32(FAR uint8_t *bin, int bytecount)
****************************************************************************/ ****************************************************************************/
static inline void writedata(FAR struct lib_sostream_s *outstream, static inline void writedata(FAR struct lib_sostream_s *outstream,
FAR uint8_t *bin, int bytecount) FAR uint8_t *data, int bytecount)
{ {
for (; bytecount > 0; bytecount--) for (; bytecount > 0; bytecount--)
{ {
outstream->put(outstream, *bin++); outstream->put(outstream, *data++);
} }
} }
@ -423,6 +423,7 @@ int hex2bin(FAR struct lib_instream_s *instream,
int nbytes; int nbytes;
int bytecount; int bytecount;
uint32_t address; uint32_t address;
uint32_t endaddr;
uint32_t expected; uint32_t expected;
uint16_t extension; uint16_t extension;
uint16_t address16; uint16_t address16;
@ -550,7 +551,7 @@ int hex2bin(FAR struct lib_instream_s *instream,
/* Do the byte swap */ /* Do the byte swap */
hex2bin_swap16(bin, bytecount); hex2bin_swap16(&bin[DATA_BINNDX], bytecount);
} }
break; break;
@ -565,7 +566,7 @@ int hex2bin(FAR struct lib_instream_s *instream,
/* Do the byte swap */ /* Do the byte swap */
hex2bin_swap32(bin, bytecount); hex2bin_swap32(&bin[DATA_BINNDX], bytecount);
} }
break; break;
@ -579,7 +580,9 @@ int hex2bin(FAR struct lib_instream_s *instream,
/* Get and verify the full 32-bit address */ /* Get and verify the full 32-bit address */
address = ((uint32_t)extension << 16) | (uint32_t)address16; address = ((uint32_t)extension << 16) | (uint32_t)address16;
if (address < baseaddr || (endpaddr != 0 && address >= endpaddr)) endaddr = address + bytecount;
if (address < baseaddr || (endpaddr != 0 && endaddr >= endpaddr))
{ {
hex2bin_debug("Line %d ERROR: Extended address %08lx is out of range\n", hex2bin_debug("Line %d ERROR: Extended address %08lx is out of range\n",
lineno, (unsigned long)address); lineno, (unsigned long)address);
@ -602,7 +605,7 @@ int hex2bin(FAR struct lib_instream_s *instream,
/* Transfer data to the OUT stream */ /* Transfer data to the OUT stream */
writedata(outstream, bin, bytecount); writedata(outstream, &bin[DATA_BINNDX], bytecount);
} }
break; break;
@ -632,16 +635,17 @@ int hex2bin(FAR struct lib_instream_s *instream,
* 0. * 0.
*/ */
if (bytecount != 2 || address16 != 0 || bin[1] != 0) if (bytecount != 2 || address16 != 0 || bin[DATA_BINNDX+1] != 0)
{ {
hex2bin_debug("Line %u ERROR: Invalid segment address\n", hex2bin_debug("Line %u ERROR: Invalid segment address\n",
lineno); lineno);
hex2bin_debug(" bytecount=%d address=%04x segment=%02x%02x\n", hex2bin_debug(" bytecount=%d address=%04x segment=%02x%02x\n",
bytecount, address16, bin[0], bin[1]); bytecount, address16, bin[DATA_BINNDX],
bin[DATA_BINNDX+1]);
goto errout_with_einval; goto errout_with_einval;
} }
extension = (uint16_t)bin[0]; extension = (uint16_t)bin[DATA_BINNDX];
break; break;
case RECORD_START_SEGADDR: /* Start segment address record */ case RECORD_START_SEGADDR: /* Start segment address record */
@ -674,7 +678,8 @@ int hex2bin(FAR struct lib_instream_s *instream,
goto errout_with_einval; goto errout_with_einval;
} }
extension = (uint16_t)bin[0] << 8 | (uint16_t)bin[1]; extension = (uint16_t)bin[DATA_BINNDX] << 8 |
(uint16_t)bin[DATA_BINNDX+1];
break; break;
case RECORD_START_LINADDR: /* Start linear address record */ case RECORD_START_LINADDR: /* Start linear address record */