From: Dmitry Shulga
Date: June 15 2011 8:41am
Subject: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3440) Bug#60987 Bug#12403662
List-Archive: http://lists.mysql.com/commits/139217
X-Bug: 60987,12403662
Message-Id: <201106150841.p5F8fvcO012707@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0430594577156741513=="

--===============0430594577156741513==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/shulga/projects/mysql/mysql-5.5-bug12403662/ based on revid:dmitry.shulga@stripped

 3440 Dmitry Shulga	2011-06-15
      Fixed bug#12403662 (formerly known as bug#60987): LOAD DATA LOCAL INFILE
      can't parse relative paths "higher" than 3 levels up
      
      When trying to LOAD DATA LOCAL INFILE using a relative path with 3 or
      more levels up in the directory hierarchy, mysqld wrongly parses 
      the path and as a consequence, can't find the file.
      
      This bug was introduced by patch for bug#58205.
      The reason for bug is that implementaiton of function cleanup_dirname()
      doesn't take into account the begin of buffer being processed during
      handling of path to file.
     @ mysys/mf_pack.c
        function cleanup_dirname() was modified: fixed wrong comparison
        condition when handling substring "../" at the begining of the buffer.

    modified:
      mysys/mf_pack.c
=== modified file 'mysys/mf_pack.c'
--- a/mysys/mf_pack.c	2010-12-29 00:26:31 +0000
+++ b/mysys/mf_pack.c	2011-06-15 08:41:49 +0000
@@ -193,7 +193,7 @@ size_t cleanup_dirname(register char *to
 	  while (pos >= start && *pos != FN_LIBCHAR)	/* remove prev dir */
 	    pos--;
           if (pos[1] == FN_HOMELIB ||
-              (pos > start && memcmp(pos, parent, length) == 0))
+              (pos >= start && memcmp(pos, parent, length) == 0))
 	  {					/* Don't remove ~user/ */
 	    pos=strmov(end_parentdir+1,parent);
 	    *pos=FN_LIBCHAR;


--===============0430594577156741513==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   cdeo0cg7k5t13rb2
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bug12403662/
# testament_sha1: 8a885c06fb31b1fbb16287d8d11d179471576e6e
# timestamp: 2011-06-15 15:41:53 +0700
# base_revision_id: dmitry.shulga@stripped\
#   ie1fg12b4adfcjc3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWxBQ9wAAeffgEAQWef/938l
jIC////wUAUGUa7ddvD2Nt63pB7wyRBlTbI0qftTTRkKenpR4ptRoPU9T9UbUHpBlCjU9mkyaJ6k
9Mk2po0AAAAACUCCATJT9KeUn+pqbU9Ufqan6pmiaNAaABIoptNTETT0TaQ0yAAAAAACSiYjUyZT
TRphPUYjRppgjJ6gaAPjRlovcmX4iIzJQgtZdmeDjkoCWRv2vZMjVfrW4eiCRi+1VVvTaiIN/syL
JZ0FQxmylXL97X8x5jjh5DvNGR2VMfEavyprJszd6FudJLcvDKmH0yxhp2drMcJ4+cu840uKlNJS
vtLcFKroszaKOl7FL8p5vM7RxiUzbz8vGXh08eHXeQqMpeblvMQoeOqvdzpSne26+6wxBHbhxBrY
stwN+mpzS6eq8+8s9p1w6oZWiEIFnKHi/wkJkpqmLp0k2SMyKgKKnUd0y7pJnQLpJOBFE9i0CaSr
wOwjws8BMG1tTSYdlSqByOXeEC35RK2Xn9kukY3azTBrthPQjTB34obQcc2O1nPWa5KvwXF4hPQs
2m33FiilQIvN2uGSvzLhzxTnlhXP0UFeMjg0gtFTZ5zoMSyzLQ9NdN5qUpFJAuvVU5lj3jI/xUiw
YbCu9ay+KvRGSYm3q05hVprNjhIVGJW1xovjLIDqrQRXNrFjKY7tRblmbwbYvnDmuIEiJmjKGZ2j
QZIAVMO2YaX2IQ8teZEp2OWfs4KcCgzpCjIwGyEHUpnDaA28FCjqA1gUoqN6psO73TqzHLEp7cpU
gqYtvBW9L6zZZykQPupBmVIigwhjEt4Dl88YcanLUGcPJWGgEevYegyHQZhBEDPF5vJzN6WEvAd7
kCU4DQYSg3Y4oW8tX8DUaEWWONU529bwZ0J4jC1QoFuEUKUM+vKUkApN9xNq0j7chQZHUoJYG4h1
TObATNZsijSMuNWotaiobOo15PCL0t86uqTasYRD7UKC2SwyHEWq6BYKi3ZjUwtmWe6xWCixGE16
0jLHE9WotbBu7RLROjYwE1OlQlkLXBRzrBWBTeI0/0eBefkPMIp7mBllO0iHW1fcJnnFk4J37Pc8
1w0CXTNuu2O12SBHicDqK1izAOxX6xzopsaK9Spt2bMpg1ouaRB0Rw1CMKxiqUYJLMVHAGy1qLuu
vQjlbJjuvLzKi2EVJAL60FMyxeZXmIoccaeyUH1GUrUOzd3zbhBaRhD2cHFE2hoqXLz2iuSNUUcG
wNHM6AxBrRSJeAqFSiesKO+mE/Kfi3vQQEc4yCG0WdXSBzFYGidOJWwlgkLVM4wKqXivCEV/CINW
OD4lAIGDOIFN8uzEAtHTPmruNs/IrJvB8K9QDYetwCwKFL8Zz0T4AsENMvX1wpGQwa8aizLdnzHM
IbipQvq54yMj6+ifL9zNA9Xrwv365RgYLO9oiWjpuhlZoOLaqrSqUqB0olAcCpqDQ6Ixz8Sopkih
pjVJBba03KgULMbMmELUibMVQ6oIjpmQ6YE6z+ETCyIeGcAw1nbQoYgxb0QXiqpJhGVivwa3sVnR
rDVbGU4MhejiJo/kJKLNVHEt2cpuv0pFgWGUjYq9EpQmqKIKreDxVUX2D+RTQrybfm6+tcfmgZ4A
+dyc75buvVbtxNDVw4jc3kZ2f8qm9lTzE+buwtnAiM4OOck9qwibMerDI6FZHJK4rGIPNRlHRCKu
kjcSeXzPeArSOp7CqcnHRi6ZbaDCTJgOXJYKUpksa6litBFDIoHyYAYFUhsAuncXhpT/F3JFOFCQ
bEFD3A==


--===============0430594577156741513==--