From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 107063 invoked by alias); 27 Sep 2019 17:37:30 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 106975 invoked by uid 9996); 27 Sep 2019 17:37:30 -0000 Date: Fri, 27 Sep 2019 17:37:00 -0000 Message-ID: <20190927173730.106970.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: normalize_win32_path: improve error checking X-Act-Checkin: newlib-cygwin X-Git-Author: Ken Brown X-Git-Refname: refs/heads/master X-Git-Oldrev: e1a0775dc0545b5f9c81b09a327fc110c538b7b4 X-Git-Newrev: 283cb372e4e25d1d11123d98e3d14e85b525e48d X-SW-Source: 2019-q3/txt/msg00091.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=283cb372e4e25d1d11123d98e3d14e85b525e48d commit 283cb372e4e25d1d11123d98e3d14e85b525e48d Author: Ken Brown Date: Wed Sep 25 14:18:18 2019 -0400 Cygwin: normalize_win32_path: improve error checking If the source path starts with the Win32 long path prefix '\\?\' or the NT object directory prefix '\??\', require the prefix to be followed by 'UNC\' or ':\'. Otherwise return EINVAL. This fixes the assertion failure in symlink_info::check that was reported here: https://cygwin.com/ml/cygwin/2019-09/msg00228.html That assertion failure was caused by normalize_win32_path returning a path with no backslashes when the source path was '\\?\DRIVE'. Diff: --- winsup/cygwin/path.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 2fbacd8..f610035 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -1406,15 +1406,18 @@ normalize_win32_path (const char *src, char *dst, char *&tail) bool beg_src_slash = isdirsep (src[0]); tail = dst; - /* Skip long path name prefixes in Win32 or NT syntax. */ + /* Skip Win32 long path name prefix and NT object directory prefix. */ if (beg_src_slash && (src[1] == '?' || isdirsep (src[1])) && src[2] == '?' && isdirsep (src[3])) { src += 4; - if (src[1] != ':') /* native UNC path */ + if (isdrive (src) && isdirsep (src[2])) + beg_src_slash = false; + else if (!strncmp (src, "UNC", 3) && isdirsep (src[3])) + /* native UNC path */ src += 2; /* Fortunately the first char is not copied... */ else - beg_src_slash = false; + return EINVAL; } if (beg_src_slash && isdirsep (src[1])) {