diff --git a/src/elog.c b/src/elog.c
index c2e33410..d1af6924 100755
--- a/src/elog.c
+++ b/src/elog.c
@@ -265,8 +265,10 @@ void convert_crlf(char *buffer, int bufsize)
    p = buffer;
    while ((p = strstr(p, "\\n")) != NULL) {
 
-      *(p++) = '\r';
-      *(p++) = '\n';
+      if ((int)p - (int)buffer < bufsize-2) {
+         *(p++) = '\r';
+         *(p++) = '\n';
+      }
    }
 }