public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: <Jim.Dailey@dell.com>
To: <ruiyu.ni@Intel.com>
Cc: <michael.d.kinney@intel.com>, <liming.gao@intel.com>,
	<edk2-devel@lists.01.org>
Subject: Re: [PATCH] MdePkg-BaseLib: Fix PathCleanUpDirectories() error involving "\..\.."
Date: Tue, 9 Oct 2018 11:40:33 +0000	[thread overview]
Message-ID: <ab8169c07a6e4b4bacf9fd332a336086@ausx13mps335.AMER.DELL.COM> (raw)
In-Reply-To: <060d11fe-ffce-0d7f-00af-bd3353ce990e@Intel.com>

>-----Original Message-----
>From: Ni, Ruiyu [mailto:ruiyu.ni@Intel.com] 
>Sent: Monday, October 8, 2018 9:55 PM
>To: Dailey, Jim
>Cc: michael.d.kinney@intel.com; liming.gao@intel.com; edk2-devel@lists.01.org
>Subject: Re: [edk2] [PATCH] MdePkg-BaseLib: Fix PathCleanUpDirectories() error involving "\..\.."
>
>
>On 10/8/2018 9:23 PM, Jim.Dailey@dell.com wrote:
>>> -----Original Message-----
>>>>
>>>> diff --git a/MdePkg/Library/BaseLib/FilePaths.c b/MdePkg/Library/BaseLib/FilePaths.c
>>>> index d6f3758ecb..5d3de01894 100644
>>>> --- a/MdePkg/Library/BaseLib/FilePaths.c
>>>> +++ b/MdePkg/Library/BaseLib/FilePaths.c
>>>> @@ -2,6 +2,7 @@
>>>>      Defines file-path manipulation functions.
>>>>    
>>>>      Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
>>>> +  Copyright (c) 2018, Dell Technologies. All rights reserved.<BR>
>>>>      This program and the accompanying materials
>>>>      are licensed and made available under the terms and conditions of the BSD License
>>>>      which accompanies this distribution.  The full text of the license may be found at
>>>> @@ -103,7 +104,9 @@ PathCleanUpDirectories(
>>>>            ) {
>>>>        *(TempString + 1) = CHAR_NULL;
>>>>        PathRemoveLastItem(Path);
>>>> -    CopyMem (Path + StrLen (Path), TempString + 3, StrSize (TempString + 3));
>>>> +    if (*(TempString + 3)) {
>>>> +      CopyMem (Path + StrLen (Path), TempString + 4, StrSize (TempString + 4));
>>>> +    }
>I just setup a debugging environment to trace the code. Finally I 
>understand the issue.
>I agree to change "TempString + 3" to "TempString + 4". This can 
>eliminate double slash so in next same loop, the pattern "\\..\\" or 
>"\\..\0" can be detected and "last item" can be correctly removed by 
>PathRemoveLastItem().
>
>Can you change
>  "if (*(TempString + 3))"
>  to
>  "if (*(TempString + 3) != CHAR_NULL)"?
>
>With the above change, Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
>If you agree, I can modify your patch and push it for you.
>
>-- 
>Thanks,
>Ray

Sure, I have no problem with `*(TempString + 3) != CHAR_NULL`. Feel
free to make that change and push it.

Thanks,
Jim

  reply	other threads:[~2018-10-09 11:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-04 15:03 [PATCH] MdePkg-BaseLib: Fix PathCleanUpDirectories() error involving "\..\.." Jim.Dailey
2018-10-08  7:00 ` Ni, Ruiyu
2018-10-08 13:23   ` Jim.Dailey
2018-10-09  2:55     ` Ni, Ruiyu
2018-10-09 11:40       ` Jim.Dailey [this message]
2018-10-08 15:26   ` Jim.Dailey
2018-10-08 15:46     ` Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ab8169c07a6e4b4bacf9fd332a336086@ausx13mps335.AMER.DELL.COM \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox