X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffolder_realloc.c;h=64a66409b40dc253fd5e58be44a99c56337039df;hp=8b0d67d220f2a15a328692c2f6a98b96e4cf1675;hb=b6823062c9806496b39ff12bf1fbe43ae127c96c;hpb=db62cda50055368e5f4ac51df787053f70706c30 diff --git a/sbr/folder_realloc.c b/sbr/folder_realloc.c index 8b0d67d..64a6640 100644 --- a/sbr/folder_realloc.c +++ b/sbr/folder_realloc.c @@ -6,6 +6,7 @@ ** complete copyright information. */ +#include #include #include @@ -24,14 +25,14 @@ 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)", + 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)", + 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 */ @@ -53,7 +54,7 @@ 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) { @@ -61,7 +62,7 @@ folder_realloc(struct msgs *mp, int lo, int hi) tmpstats[msgnum - lo] = mp->msgstats[msgnum - mp->lowoff]; } } - free(mp->msgstats); + mh_free0(&(mp->msgstats)); mp->msgstats = tmpstats; }