b436e3c8aa
reference: https://github.com/google/brotli/pull/893 https://github.com/tianocore/edk2/pull/2347 https://github.com/tianocore/edk2/pull/2694 Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 85021f8cf22d1bd4114803c6c610dea5ef0059f1 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Thu, 24 Mar 2022 20:04:35 +0800
|
|
Subject: [PATCH 2/3] BaseTools: fix gcc12 warning
|
|
|
|
Sdk/C/LzmaEnc.c: In function ?LzmaEnc_CodeOneMemBlock?:
|
|
Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*p.rc.outStream? [-Werror=dangling-pointer=]
|
|
2828 | p->rc.outStream = &outStream.vt;
|
|
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
|
|
Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here
|
|
2811 | CLzmaEnc_SeqOutStreamBuf outStream;
|
|
| ^~~~~~~~~
|
|
Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here
|
|
Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*(CLzmaEnc *)pp.rc.outStream? [-Werror=dangling-pointer=]
|
|
2828 | p->rc.outStream = &outStream.vt;
|
|
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
|
|
Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here
|
|
2811 | CLzmaEnc_SeqOutStreamBuf outStream;
|
|
| ^~~~~~~~~
|
|
Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here
|
|
cc1: all warnings being treated as errors
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
|
|
|
|
reference: https://github.com/tianocore/edk2/pull/2694
|
|
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
|
|
---
|
|
BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
|
|
index 4e9b499f8d..4b9f5fa692 100644
|
|
--- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
|
|
+++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
|
|
@@ -2638,12 +2638,13 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, Bool reInit,
|
|
|
|
nowPos64 = p->nowPos64;
|
|
RangeEnc_Init(&p->rc);
|
|
- p->rc.outStream = &outStream.vt;
|
|
|
|
if (desiredPackSize == 0)
|
|
return SZ_ERROR_OUTPUT_EOF;
|
|
|
|
+ p->rc.outStream = &outStream.vt;
|
|
res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
|
|
+ p->rc.outStream = NULL;
|
|
|
|
*unpackSize = (UInt32)(p->nowPos64 - nowPos64);
|
|
*destLen -= outStream.rem;
|
|
--
|
|
2.41.0.windows.1
|
|
|