Added a fix for an overflow issue that could happen with NmeaStringSize variable.

mluis1 · mluis1 · commit 38d30586d857 · 2017-03-31T14:15:59.000+02:00
Issue #209
diff --git a/src/boards/LoRaMote/gps-board.c b/src/boards/LoRaMote/gps-board.c
@@ -103,7 +103,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )
     {
         if( UartGetChar( &Uart1, &data ) == 0 )
         {
-            if( ( data == '$' ) || ( NmeaStringSize >= 128 ) )
+            if( ( data == '$' ) || ( NmeaStringSize >= 127 ) )
             {
                 NmeaStringSize = 0;
             }
@@ -112,7 +112,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )
 
             if( data == '\n' )
             {
-                NmeaString[NmeaStringSize] = '\0';
+                NmeaString[NmeaStringSize++] = '\0';
                 GpsParseGpsData( ( int8_t* )NmeaString, NmeaStringSize );
                 UartDeInit( &Uart1 );
                 BlockLowPowerDuringTask ( false );
diff --git a/src/boards/NAMote72/gps-board.c b/src/boards/NAMote72/gps-board.c
@@ -119,7 +119,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )
     {
         if( UartGetChar( &Uart1, &data ) == 0 )
         {
-            if( ( data == '$' ) || ( NmeaStringSize >= 128 ) )
+            if( ( data == '$' ) || ( NmeaStringSize >= 127 ) )
             {
                 NmeaStringSize = 0;
             }
@@ -128,7 +128,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )
 
             if( data == '\n' )
             {
-                NmeaString[NmeaStringSize] = '\0';
+                NmeaString[NmeaStringSize++] = '\0';
                 GpsParseGpsData( ( int8_t* )NmeaString, NmeaStringSize );
                 UartDeInit( &Uart1 );
                 BlockLowPowerDuringTask ( false );
diff --git a/src/boards/SensorNode/gps-board.c b/src/boards/SensorNode/gps-board.c
@@ -94,7 +94,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )
     {
         if( UartGetChar( &Uart1, &data ) == 0 )
         {
-            if( ( data == '$' ) || ( NmeaStringSize >= 128 ) )
+            if( ( data == '$' ) || ( NmeaStringSize >= 127 ) )
             {
                 NmeaStringSize = 0;
             }
@@ -103,7 +103,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )
 
             if( data == '\n' )
             {
-                NmeaString[NmeaStringSize] = '\0';
+                NmeaString[NmeaStringSize++] = '\0';
                 GpsParseGpsData( ( int8_t* )NmeaString, NmeaStringSize );
                 UartDeInit( &Uart1 );
                 BlockLowPowerDuringTask ( false );

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )`
`103`	`103`	`{`
`104`	`104`	`if( UartGetChar( &Uart1, &data ) == 0 )`
`105`	`105`	`{`
`106`		`- if( ( data == '$' ) \|\| ( NmeaStringSize >= 128 ) )`
	`106`	`+ if( ( data == '$' ) \|\| ( NmeaStringSize >= 127 ) )`
`107`	`107`	`{`
`108`	`108`	`NmeaStringSize = 0;`
`109`	`109`	`}`
`@@ -112,7 +112,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )`
`112`	`112`
`113`	`113`	`if( data == '\n' )`
`114`	`114`	`{`
`115`		`- NmeaString[NmeaStringSize] = '\0';`
	`115`	`+ NmeaString[NmeaStringSize++] = '\0';`
`116`	`116`	`GpsParseGpsData( ( int8_t* )NmeaString, NmeaStringSize );`
`117`	`117`	`UartDeInit( &Uart1 );`
`118`	`118`	`BlockLowPowerDuringTask ( false );`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )`
`119`	`119`	`{`
`120`	`120`	`if( UartGetChar( &Uart1, &data ) == 0 )`
`121`	`121`	`{`
`122`		`- if( ( data == '$' ) \|\| ( NmeaStringSize >= 128 ) )`
	`122`	`+ if( ( data == '$' ) \|\| ( NmeaStringSize >= 127 ) )`
`123`	`123`	`{`
`124`	`124`	`NmeaStringSize = 0;`
`125`	`125`	`}`
`@@ -128,7 +128,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )`
`128`	`128`
`129`	`129`	`if( data == '\n' )`
`130`	`130`	`{`
`131`		`- NmeaString[NmeaStringSize] = '\0';`
	`131`	`+ NmeaString[NmeaStringSize++] = '\0';`
`132`	`132`	`GpsParseGpsData( ( int8_t* )NmeaString, NmeaStringSize );`
`133`	`133`	`UartDeInit( &Uart1 );`
`134`	`134`	`BlockLowPowerDuringTask ( false );`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )`
`94`	`94`	`{`
`95`	`95`	`if( UartGetChar( &Uart1, &data ) == 0 )`
`96`	`96`	`{`
`97`		`- if( ( data == '$' ) \|\| ( NmeaStringSize >= 128 ) )`
	`97`	`+ if( ( data == '$' ) \|\| ( NmeaStringSize >= 127 ) )`
`98`	`98`	`{`
`99`	`99`	`NmeaStringSize = 0;`
`100`	`100`	`}`
`@@ -103,7 +103,7 @@ void GpsMcuIrqNotify( UartNotifyId_t id )`
`103`	`103`
`104`	`104`	`if( data == '\n' )`
`105`	`105`	`{`
`106`		`- NmeaString[NmeaStringSize] = '\0';`
	`106`	`+ NmeaString[NmeaStringSize++] = '\0';`
`107`	`107`	`GpsParseGpsData( ( int8_t* )NmeaString, NmeaStringSize );`
`108`	`108`	`UartDeInit( &Uart1 );`
`109`	`109`	`BlockLowPowerDuringTask ( false );`