Fix nasa#298, fix inifinite loop

jphickey · Oct 9, 2019 · b7e1307 · b7e1307
1 parent 2214306
commit b7e1307
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/fsw/cfe-core/src/fs/cfe_fs_decompress.c b/fsw/cfe-core/src/fs/cfe_fs_decompress.c
@@ -284,16 +284,14 @@ int16 FS_gz_fill_inbuf_Reentrant( CFE_FS_Decompress_State_t *State )
    {
 		len = OS_read( State->srcFile_fd, (int8*)State->inbuf + State->insize, INBUFSIZ - State->insize );
 
-		if ( len == 0 || len == EOF || len == OS_FS_ERROR ) break;
+		if ( len <= 0 ) break;
 
 		State->insize += len;
 
 	} while ( State->insize < INBUFSIZ );
 
 
-	if ( State->insize == 0 ) return EOF;
-
-	if ( len == OS_FS_ERROR ) 
+	if ( State->insize == 0 || len < 0) 
    {
 		State->Error = CFE_FS_GZIP_READ_ERROR;
 		return EOF;