From: Art Cancro <ajc@citadel.org>
Date: Wed, 13 Jan 2010 00:08:13 +0000 (+0000)
Subject: * fixed a bug in network_process_file() that was causing every message to be loaded... 
X-Git-Tag: v7.86~509
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=fa3cf4661a5e0a7bfdd57167d403e187c9a6cb99;p=citadel.git

* fixed a bug in network_process_file() that was causing every message to be loaded into a buffer with a length of 1 byte.
---

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 69de440c8..d73e4b7e1 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -1644,7 +1644,6 @@ void network_process_message(FILE *fp, long msgstart, long msgend) {
 	long hold_pos;
 	long size;
 	char *buffer;
-	size_t siz;
 
 	CtdlLogPrintf(CTDL_DEBUG, "network_process_message() processing bytes %ld through %ld\n", msgstart, msgend);
 
@@ -1653,8 +1652,9 @@ void network_process_message(FILE *fp, long msgstart, long msgend) {
 	buffer = malloc(size);
 	if (buffer != NULL) {
 		fseek(fp, msgstart, SEEK_SET);
-		siz = fread(buffer, size, 1, fp);
-		network_process_buffer(buffer, siz);
+		if (fread(buffer, size, 1, fp) > 0) {
+			network_process_buffer(buffer, size);
+		}
 		free(buffer);
 	}