mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-22 07:27:59 -08:00
Code

libz: sync with upstream

Browse Source 
fixes a possible redefinition of z_const and adds a range check for
MAX_WBITS.

ok bluhm
This commit is contained in:
tb 2024-11-09 21:51:37 +00:00
parent 0fae8ff559
commit 151539ad7d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libz/zconf.h
View File

@ -233,10 +233,12 @@
# endif # endif
#endif #endif
#if defined(ZLIB_CONST) && !defined(z_const) #ifndef z_const
# define z_const const # ifdef ZLIB_CONST
#else # define z_const const
# define z_const # else
# define z_const
# endif
#endif #endif
#ifdef Z_SOLO #ifdef Z_SOLO

4
lib/libz/zutil.h
View File

@ -67,7 +67,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
/* To be used only when the state is known to be valid */ /* To be used only when the state is known to be valid */
/* common constants */ /* common constants */
#if MAX_WBITS < 9 || MAX_WBITS > 15
# error MAX_WBITS must be in 9..15
#endif
#ifndef DEF_WBITS #ifndef DEF_WBITS
# define DEF_WBITS MAX_WBITS # define DEF_WBITS MAX_WBITS
#endif #endif