From 62064da186e20624751eb8d67255b7629c6a4398 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Tue, 11 Oct 2005 15:23:34 -0700
Subject: Fix read past allocated buffer when parsing charsets file. (Bug
 #6413)

strings/xml.c:
  Don't look for comment past end of buffer.
---
 strings/xml.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'strings/xml.c')

diff --git a/strings/xml.c b/strings/xml.c
index 6ba52ea41a8..cec15b99f10 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -81,7 +81,7 @@ static int my_xml_scan(MY_XML_PARSER *p,MY_XML_ATTR *a)
   a->beg=p->cur;
   a->end=p->cur;
   
-  if (!bcmp(p->cur,"<!--",4))
+  if ((p->end - p->cur > 3) && !bcmp(p->cur,"<!--",4))
   {
     for( ; (p->cur < p->end) && bcmp(p->cur, "-->", 3); p->cur++)
     {}
-- 
cgit v1.2.1