zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loadFile to return file length once again. 

git-svn-id: svn://svn.berlios.de/openocd/trunk@1661 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
zwelch 2009-05-08 05:30:37 +00:00
parent 641919d491
commit 6d60d22687
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/helper/ioutil.c
View File

@ -91,6 +91,9 @@ int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd,
* a 0 byte(sentinel) after len bytes - the length of the file. */ * a 0 byte(sentinel) after len bytes - the length of the file. */
int loadFile(const char *fileName, void **data, size_t *len) int loadFile(const char *fileName, void **data, size_t *len)
{ {
// ensure returned length is always sane
*len = 0;
FILE * pFile; FILE * pFile;
pFile = fopen(fileName,"rb"); pFile = fopen(fileName,"rb");
if (pFile==NULL) if (pFile==NULL)
@ -111,6 +114,7 @@ int loadFile(const char *fileName, void **data, size_t *len)
fclose(pFile); fclose(pFile);
return ERROR_FAIL; return ERROR_FAIL;
} }
*len = fsize;
if (fseek(pFile, 0, SEEK_SET)!=0) if (fseek(pFile, 0, SEEK_SET)!=0)
{ {
@ -118,7 +122,7 @@ int loadFile(const char *fileName, void **data, size_t *len)
fclose(pFile); fclose(pFile);
return ERROR_FAIL; return ERROR_FAIL;
} }
*data = malloc(fsize + 1); *data = malloc(*len + 1);
if (*data==NULL) if (*data==NULL)
{ {
LOG_ERROR("Can't open %s\n", fileName); LOG_ERROR("Can't open %s\n", fileName);
@ -134,12 +138,12 @@ int loadFile(const char *fileName, void **data, size_t *len)
return ERROR_FAIL; return ERROR_FAIL;
} }
fclose(pFile); fclose(pFile);
*(((char *)(*data))+*len)=0; /* sentinel */
// 0-byte after buffer (not included in *len) serves as a sentinel
char *buf = (char *)*data;
buf[*len = 0;
return ERROR_OK; return ERROR_OK;
} }