Fix covscan patch that caused compiler warnings
This commit is contained in:
parent
872735211a
commit
7a6d1b10bf
@ -21,31 +21,3 @@ index 089285a..9b09718 100644
|
|||||||
|
|
||||||
bstate = DEFLATE_HOOK(strm, flush, &bstate) ? bstate :
|
bstate = DEFLATE_HOOK(strm, flush, &bstate) ? bstate :
|
||||||
s->level == 0 ? deflate_stored(s, flush) :
|
s->level == 0 ? deflate_stored(s, flush) :
|
||||||
diff -rup zlib-1.2.12/test/crc32_test.c.old zlib-1.2.12/test/crc32_test.c
|
|
||||||
--- zlib-1.2.12/test/crc32_test.c.old 2022-06-23 11:20:52.393574517 +0000
|
|
||||||
+++ zlib-1.2.12/test/crc32_test.c 2022-06-23 11:21:50.195574517 +0000
|
|
||||||
@@ -11,7 +11,7 @@
|
|
||||||
# include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-void test_crc32 OF((uLong crc, Byte* buf, z_size_t len, uLong chk, int line));
|
|
||||||
+void test_crc32 OF((uLong crc, char* buf, z_size_t len, uLong chk, int line));
|
|
||||||
int main OF((void));
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
@@ -24,12 +24,12 @@ typedef struct {
|
|
||||||
|
|
||||||
void test_crc32(crc, buf, len, chk, line)
|
|
||||||
uLong crc;
|
|
||||||
- Byte *buf;
|
|
||||||
+ char *buf;
|
|
||||||
z_size_t len;
|
|
||||||
uLong chk;
|
|
||||||
int line;
|
|
||||||
{
|
|
||||||
- uLong res = crc32(crc, buf, len);
|
|
||||||
+ uLong res = crc32(crc, (Bytef *) buf, len);
|
|
||||||
if (res != chk) {
|
|
||||||
fprintf(stderr, "FAIL [%d]: crc32 returned 0x%08X expected 0x%08X\n",
|
|
||||||
line, (unsigned int)res, (unsigned int)chk);
|
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: zlib
|
Name: zlib
|
||||||
Version: 1.2.12
|
Version: 1.2.12
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Compression and decompression library
|
Summary: Compression and decompression library
|
||||||
# /contrib/dotzlib/ have Boost license
|
# /contrib/dotzlib/ have Boost license
|
||||||
License: zlib and Boost
|
License: zlib and Boost
|
||||||
@ -174,6 +174,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 28 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.12-2
|
||||||
|
- Fix covscan patch that caused compiler warnings
|
||||||
|
|
||||||
* Tue Apr 05 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.12-1
|
* Tue Apr 05 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.12-1
|
||||||
- Rebase to 1.2.12
|
- Rebase to 1.2.12
|
||||||
- Resolves: CVE-2018-25032
|
- Resolves: CVE-2018-25032
|
||||||
|
Loading…
Reference in New Issue
Block a user