interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fread with mingw32 compiled can return < file sz, 

because it automatically converts \r\n into \n
This commit is contained in:
Willem Toorop 2017-09-28 15:09:16 +02:00
parent b9260f8fca
commit 078c50f1b2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/getdns_query.c
View File

@ -543,6 +543,7 @@ int parse_config_file(const char *fn, int report_open_failure)
FILE *fh; FILE *fh;
char *config_file = NULL; char *config_file = NULL;
long config_file_sz; long config_file_sz;
size_t read_sz;
if (!(fh = fopen(fn, "r"))) { if (!(fh = fopen(fn, "r"))) {
if (report_open_failure) if (report_open_failure)
@ -567,13 +568,14 @@ int parse_config_file(const char *fn, int report_open_failure)
return GETDNS_RETURN_MEMORY_ERROR; return GETDNS_RETURN_MEMORY_ERROR;
} }
rewind(fh); rewind(fh);
if (fread(config_file, 1, config_file_sz, fh) != (size_t)config_file_sz) { read_sz = fread(config_file, 1, config_file_sz + 1, fh);
if (read_sz > config_file_sz || ferror(fh) || !feof(fh)) {
fprintf( stderr, "An error occurred while reading \"%s\": %s\n" fprintf( stderr, "An error occurred while reading \"%s\": %s\n"
, fn, strerror(errno)); , fn, strerror(errno));
fclose(fh); fclose(fh);
return GETDNS_RETURN_MEMORY_ERROR; return GETDNS_RETURN_MEMORY_ERROR;
} }
config_file[config_file_sz] = 0; config_file[read_sz] = 0;
fclose(fh); fclose(fh);
parse_config(config_file, strstr(fn, ".yml") != NULL); parse_config(config_file, strstr(fn, ".yml") != NULL);
free(config_file); free(config_file);