Issue #1272 - Applied the proposed fix for the CRC check of empty struct

mluis1 · mluis1 · commit aa2bef819312 · 2022-10-11T13:47:40.000+02:00
diff --git a/src/apps/LoRaMac/common/NvmDataMgmt.c b/src/apps/LoRaMac/common/NvmDataMgmt.c
@@ -186,9 +186,12 @@ uint16_t NvmDataMgmtRestore( void )
     offset += sizeof( SecureElementNvmData_t );
 
     // Region group 1
-    if( NvmmCrc32Check( sizeof( RegionNvmDataGroup1_t ), offset ) == false )
+    if( sizeof( RegionNvmDataGroup1_t ) > sizeof( uint32_t ) )
     {
-        return 0;
+        if( NvmmCrc32Check( sizeof( RegionNvmDataGroup1_t ), offset ) == false )
+        {
+            return 0;
+        }
     }
     offset += sizeof( RegionNvmDataGroup1_t );
 

Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,12 @@ uint16_t NvmDataMgmtRestore( void )`
`186`	`186`	`offset += sizeof( SecureElementNvmData_t );`
`187`	`187`
`188`	`188`	`// Region group 1`
`189`		`- if( NvmmCrc32Check( sizeof( RegionNvmDataGroup1_t ), offset ) == false )`
	`189`	`+ if( sizeof( RegionNvmDataGroup1_t ) > sizeof( uint32_t ) )`
`190`	`190`	`{`
`191`		`- return 0;`
	`191`	`+ if( NvmmCrc32Check( sizeof( RegionNvmDataGroup1_t ), offset ) == false )`
	`192`	`+ {`
	`193`	`+ return 0;`
	`194`	`+ }`
`192`	`195`	`}`
`193`	`196`	`offset += sizeof( RegionNvmDataGroup1_t );`
`194`	`197`