X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_realloc.c;h=52c3647dfda7b891455c2e62b106af79eb96750a;hp=f1b703f4d2b77b757b1505edff35788b5b8fb5a1;hb=a4ff68e851c0931ced437f73a1acb0fedb28bec3;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/sbr/folder_realloc.c b/sbr/folder_realloc.c
index f1b703f..52c3647 100644
--- a/sbr/folder_realloc.c
+++ b/sbr/folder_realloc.c
@@ -6,6 +6,7 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
 #include <h/utils.h>
 
@@ -24,15 +25,15 @@ folder_realloc(struct msgs *mp, int lo, int hi)
 
 	/* sanity checks */
 	if (lo < 1)
-		adios(NULL, "BUG: called folder_realloc with lo (%d) < 1", lo);
+		adios(EX_SOFTWARE, NULL, "BUG: called folder_realloc with lo (%d) < 1", lo);
 	if (hi < 1)
-		adios(NULL, "BUG: called folder_realloc with hi (%d) < 1", hi);
+		adios(EX_SOFTWARE, NULL, "BUG: called folder_realloc with hi (%d) < 1", hi);
 	if (mp->nummsg > 0 && lo > mp->lowmsg)
-		adios(NULL, "BUG: called folder_realloc with lo (%d) > mp->lowmsg (%d)",
-			   lo, mp->lowmsg);
+		adios(EX_SOFTWARE, NULL, "BUG: called folder_realloc with lo (%d) > mp->lowmsg (%d)",
+				lo, mp->lowmsg);
 	if (mp->nummsg > 0 && hi < mp->hghmsg)
-		adios(NULL, "BUG: called folder_realloc with hi (%d) < mp->hghmsg (%d)",
-			   hi, mp->hghmsg);
+		adios(EX_SOFTWARE, NULL, "BUG: called folder_realloc with hi (%d) < mp->hghmsg (%d)",
+				hi, mp->hghmsg);
 
 	/* Check if we really need to reallocate anything */
 	if (lo == mp->lowoff && hi == mp->hghoff)
@@ -45,6 +46,12 @@ folder_realloc(struct msgs *mp, int lo, int hi)
 		** just realloc the message status array.
 		*/
 		mp->msgstats = mh_xrealloc(mp->msgstats, MSGSTATSIZE(mp, lo, hi));
+		/*
+		** Clear the newly allocated msg flag space. The lowoff and
+		** hghoff are the old messagenumber range. So the calculation
+		** of the first new element has to subtract lowoff.
+		*/
+		memset(mp->msgstats + mp->hghoff - lo + 1, 0, hi - mp->hghoff);
 	} else {
 		/*
 		** We are changing the offset of the message status
@@ -53,34 +60,20 @@ folder_realloc(struct msgs *mp, int lo, int hi)
 		seqset_t *tmpstats;
 
 		/* first allocate the new message status space */
-		tmpstats = mh_xmalloc(MSGSTATSIZE(mp, lo, hi));
+		tmpstats = mh_xcalloc(MSGSTATSIZE(mp, lo, hi), 1);
 
 		/* then copy messages status array with shift */
 		if (mp->nummsg > 0) {
-			for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++)
+			for (msgnum=mp->lowmsg; msgnum<=mp->hghmsg; msgnum++) {
 				tmpstats[msgnum - lo] = mp->msgstats[msgnum - mp->lowoff];
+			}
 		}
-		free(mp->msgstats);
+		mh_free0(&(mp->msgstats));
 		mp->msgstats = tmpstats;
 	}
 
 	mp->lowoff = lo;
 	mp->hghoff = hi;
 
-	/*
-	** Clear all the flags for entries outside
-	** the current message range for this folder.
-	*/
-	if (mp->nummsg > 0) {
-		for (msgnum = mp->lowoff; msgnum < mp->lowmsg; msgnum++)
-			clear_msg_flags(mp, msgnum);
-		for (msgnum = mp->hghmsg + 1; msgnum <= mp->hghoff; msgnum++)
-			clear_msg_flags(mp, msgnum);
-	} else {
-		/* no messages, so clear entire range */
-		for (msgnum = mp->lowoff; msgnum <= mp->hghoff; msgnum++)
-			clear_msg_flags(mp, msgnum);
-	}
-
 	return mp;
 }