Vergil_Wong/lib_xua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to handle error case where input file is a directory

Browse Source
This commit is contained in:
Oscar Bailey
2020-10-27 13:14:34 +00:00
parent a496040de0
commit 3a917e5161
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib_xua/host/xmosdfu/xmosdfu.cpp
View File

@@ -2,8 +2,17 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
// Used for checking if a file is a directory
#ifndef S_ISDIR
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
#endif
#define stat _stat
#define fstat _fstat
#else #else
#include <unistd.h> #include <unistd.h>
@@ -235,6 +244,7 @@ int write_dfu_image(char *file)
unsigned int timeout = 0; unsigned int timeout = 0;
unsigned char strIndex = 0; unsigned char strIndex = 0;
unsigned int dfuBlockCount = 0; unsigned int dfuBlockCount = 0;
struct stat statbuf;
inFile = fopen( file, "rb" ); inFile = fopen( file, "rb" );
if( inFile == NULL ) if( inFile == NULL )
@@ -243,6 +253,19 @@ int write_dfu_image(char *file)
return -1; return -1;
} }
/* Check if file is a directory */
int status = fstat(fileno(inFile), &statbuf);
if (status != 0)
{
fprintf(stderr,"Error: Failed to get info on file.\n");
return -1;
}
if ( S_ISDIR(statbuf.st_mode) )
{
fprintf(stderr,"Error: Specified path is a directory.\n");
return -1;
}
/* Discover the size of the image. */ /* Discover the size of the image. */
if( 0 != fseek( inFile, 0, SEEK_END ) ) if( 0 != fseek( inFile, 0, SEEK_END ) )
{ {