diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 45a272d0b40b05970907c41a60d08216a691345b..d018078d4ebdf794be425048566fee42ab3fa342 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -785,6 +785,11 @@ js_word_wrap(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 		old_prefix_bytes=prefix_bytes;
 	}
 	for(; inbuf[i]; i++) {
+		if(l>=len*2+2) {
+			l-=4;
+			linebuf[l]=0;
+			lprintf(LOG_CRIT, "Word wrap line buffer exceeded... munging line %s",linebuf);
+		}
 		switch(inbuf[i]) {
 			case '\r':
 				crcount++;