Reviewed-by: Dandan Bi <[email protected]>
Thanks, Dandan > -----Original Message----- > From: Jeff Brasen <[email protected]> > Sent: Tuesday, June 23, 2020 2:20 AM > To: [email protected] > Cc: Gao, Liming <[email protected]>; Bi, Dandan <[email protected]>; > Jeff Brasen <[email protected]> > Subject: [PATCH v2] MdeModulePkg/DxeCorePerformanceLib: Switch to > UnicodeStrnToAsciiStrS > > UnicodeStrToAsciiStrS requires that the source string is shorter than the > destination buffer and will ASSERT if this is not true. Switch to > UnicodeStrnToAsciiStrS as there are cases where the source string is longer > than the buffer allocated for the device path. > > Signed-off-by: Jeff Brasen <[email protected]> > --- > .../Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git > a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLi > b.c > b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLi > b.c > index f500e20b32..d378c59dd9 100644 > --- > a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLi > b.c > +++ > b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLi > b.c > @@ -837,7 +837,7 @@ GetDeviceInfoFromHandleAndUpdateLength ( > ControllerNameStringSize = FPDT_MAX_PERF_RECORD_SIZE - (*Length) - > 1; > } > > - UnicodeStrToAsciiStrS(StringPtr, ComponentNameString, > ControllerNameStringSize); > + UnicodeStrnToAsciiStrS(StringPtr, ControllerNameStringSize - 1, > + ComponentNameString, ControllerNameStringSize, > + &ControllerNameStringSize); > > // > // Add a space in the end of the ControllerName @@ -879,7 +879,7 @@ > GetDeviceInfoFromHandleAndUpdateLength ( > AsciiStringPtr = ComponentNameString; > } > > - UnicodeStrToAsciiStrS(StringPtr, AsciiStringPtr, DevicePathStringSize); > + UnicodeStrnToAsciiStrS(StringPtr, DevicePathStringSize - 1, > + AsciiStringPtr, DevicePathStringSize, &DevicePathStringSize); > *Length += (UINT8)DevicePathStringSize; > return EFI_SUCCESS; > } > -- > 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#61626): https://edk2.groups.io/g/devel/message/61626 Mute This Topic: https://groups.io/mt/75044750/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
