From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: zhichao.gao@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Tue, 09 Apr 2019 17:45:05 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 17:45:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,331,1549958400"; d="scan'208";a="130026125" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga007.jf.intel.com with ESMTP; 09 Apr 2019 17:45:03 -0700 Received: from fmsmsx122.amr.corp.intel.com (10.18.125.37) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 9 Apr 2019 17:44:49 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 9 Apr 2019 17:44:49 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.164]) by shsmsx102.ccr.corp.intel.com ([169.254.2.206]) with mapi id 14.03.0415.000; Wed, 10 Apr 2019 08:44:47 +0800 From: "Gao, Zhichao" To: Heinrich Schuchardt , "devel@edk2.groups.io" , "Carsey, Jaben" , "Ni, Ray" , Leif Lindholm CC: "Gao, Liming" Subject: Re: [edk2-devel] [PATCH 1/1] ShellPkg/CommandLib: avoid NULL derefence and memory leak Thread-Topic: [edk2-devel] [PATCH 1/1] ShellPkg/CommandLib: avoid NULL derefence and memory leak Thread-Index: AQHU61Re5f6igwTAkkCxAnxV9DHQZKYzQruggABFbQCAAQSMgA== Date: Wed, 10 Apr 2019 00:44:46 +0000 Message-ID: <3CE959C139B4C44DBEA1810E3AA6F9000B7C1247@SHSMSX101.ccr.corp.intel.com> References: <20190405012903.20796-1-xypron.glpk@gmx.de> <3CE959C139B4C44DBEA1810E3AA6F9000B7C0E98@SHSMSX101.ccr.corp.intel.com> <30091abc-66a8-f110-442b-0b7cab347a54@gmx.de> In-Reply-To: <30091abc-66a8-f110-442b-0b7cab347a54@gmx.de> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhichao.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable No problem with the attachment. I usually use the command "git am --3way --ignore-space-change --keep-cr *.= patch". That make the same meaning with your 'am' options if the patch is o= k. Compare with your attachment and the patch extract form the email, seems so= me blank lines is missing. Thanks, Zhichao > -----Original Message----- > From: Heinrich Schuchardt [mailto:xypron.glpk@gmx.de] > Sent: Wednesday, April 10, 2019 12:37 AM > To: Gao, Zhichao ; devel@edk2.groups.io; Carsey, > Jaben ; Ni, Ray ; Leif Lindholm > > Cc: Gao, Liming > Subject: Re: [edk2-devel] [PATCH 1/1] ShellPkg/CommandLib: avoid NULL > derefence and memory leak >=20 > On 4/9/19 7:33 AM, Gao, Zhichao wrote: > > The patch code looks good to me. > > But while I apply this patch, it will shows "error: corrupt patch at li= ne 24" > and " error: could not build fake ancestor". Maybe you direct change the > patch file and remove some blank lines. > > For Uefi BdsDxe driver, the variable "PlatfomLang" would be initialize = all the > time. But maybe other manufacturers may have their own Bds solution and > do not set this variable. This patch makes the Shell app more compatible. > > > > Without the patch warning. > > Reviewed-by: Zhichao Gao >=20 > Hello Zhichao, >=20 > I am not able to reproduce the problem. I resend you the patch as > attachment. >=20 > When applying I had to use --keep-cr: >=20 > git am --keep-cr \ > ../patch/0001-ShellPkg-CommandLib-avoid-NULL-derefence-and-memory- > .patch >=20 > I have found no way neither on Windows nor on Linux to create a patch tha= t > applies without --keep-cr. >=20 > If you still have a problem, please, send me your global and local gitcon= fig > files, your .gitattributes and indicate on which operating system you are > working with which git version. >=20 > Best regards >=20 > Heinrich