X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmsgbase.c;fp=citadel%2Fmsgbase.c;h=073410d182223e87fed4380b29d7cad120e5c2cb;hp=e81d14623cb314b9c44c6ebffb5fd88cbecc5539;hb=102fdb5168aadb6f8d0a0c4ccd0f09a0bbd0fd90;hpb=4bde8611a7a9af19f8239459b8aab07a5542b03b

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index e81d14623..073410d18 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1153,8 +1153,12 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body)
 			}
 			field_header = *mptr++;
 		}
+		if (mptr >= upper_bound) {
+			break;
+		}
 		which = field_header;
 		len = strlen(mptr);
+
 		CM_SetField(ret, which, mptr, len);
 
 		mptr += len + 1;	/* advance to next field */