diff --git a/HTMLparser.c b/HTMLparser.c
index 2ab99de1..35859e32 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -2314,7 +2314,7 @@ htmlEncodeEntities(unsigned char* out, int *outlen,
 	    else
 		cp = ent->name;
 	    len = strlen(cp);
-	    if (out + 2 + len > outend)
+	    if (outend - out < len + 2)
 		break;
 	    *out++ = '&';
 	    memcpy(out, cp, len);