X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fnetconfig.c;h=d87d522cbfe56e0e9608f4a575c90be1ac2694b3;hb=d268ace45e855ddadeea5c837a31dea33f0f26bd;hp=55d98d1ae148dd1cc238a47b771cade392ddbdb3;hpb=821bf33f886e4b7126798ab4de68f6049ac06d77;p=citadel.git diff --git a/citadel/netconfig.c b/citadel/netconfig.c index 55d98d1ae..d87d522cb 100644 --- a/citadel/netconfig.c +++ b/citadel/netconfig.c @@ -931,14 +931,19 @@ void convert_legacy_netcfg_files(void) if (fp) { fseek(fp, 0L, SEEK_END); len = ftell(fp); - v = malloc(len); - if (v) { - rewind(fp); - if (fread(v, len, 1, fp)) { - write_netconfig_to_configdb(roomnum, v); - unlink(filename); + if (len > 0) { + v = malloc(len); + if (v) { + rewind(fp); + if (fread(v, len, 1, fp)) { + write_netconfig_to_configdb(roomnum, v); + unlink(filename); + } + free(v); } - free(v); + } + else { + unlink(filename); // zero length netconfig, just delete it } fclose(fp); }