From: Art Cancro <ajc@citadel.org>
Date: Mon, 18 Jan 2016 02:31:44 +0000 (-0500)
Subject: Handle zero-length legacy netconfig files correctly (just delete them)
X-Git-Tag: Release_902~74
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d268ace45e855ddadeea5c837a31dea33f0f26bd

Handle zero-length legacy netconfig files correctly (just delete them)
---

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 5893fe76b..acae63787 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -772,6 +772,8 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
 	rss_aggregator *use_this_RSSAggr = NULL;
 	void *vptr;
 
+	TRACE;
+
 	pthread_mutex_lock(&RSSQueueMutex);
 	if (GetHash(RSSQueueRooms, LKEY(qrbuf->QRnumber), &vptr))
 	{
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);
 			}