Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug # 38012 - 64bit issues within CRC-32 code.

Browse Source 
Define 32-bit integral types in portable.h (nsldapi_int_32 and
	nsldapi_uint_32) and use them in the memcache crc32_convert()
	function.
This commit is contained in:
mcs%netscape.com 2002-11-15 20:15:53 +00:00
parent 466011238d
commit 528fd9ba96
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
directory/c-sdk/ldap/include/portable.h
View File

@ -368,6 +368,19 @@ extern char *strdup();
#endif
#endif
/*
* Define portable 32-bit integral types.
*/
#include <limits.h>
#if UINT_MAX >= 0xffffffffU /* an int holds at least 32 bits */
typedef signed int nsldapi_int_32;
typedef unsigned int nsldapi_uint_32;
#else /* ints are < 32 bits; use long instead */
typedef signed long nsldapi_int_32;
typedef unsigned long nsldapi_uint_32;
#endif
/*
* Define a portable type for IPv4 style Internet addresses (32 bits):
*/
@ -375,7 +388,7 @@ extern char *strdup();
defined(aix) || defined(HPUX11) || defined(OSF1)
typedef in_addr_t nsldapi_in_addr_t;
#else
typedef unsigned long nsldapi_in_addr_t;
typedef nsldapi_uint_32 nsldapi_in_addr_t;
#endif
#ifdef SUNOS4

12
directory/c-sdk/ldap/libraries/libldap/memcache.c
View File

@ -2129,7 +2129,7 @@ attrkey_clearnode(void **ppTableData, void *pData)
*/
#define NSLDAPI_CRC32_POLY 0x04c11db7 /* AUTODIN II, Ethernet, & FDDI */
static unsigned long crc32_table[256] = {
static nsldapi_uint_32 crc32_table[256] = {
0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
@ -2181,15 +2181,11 @@ static unsigned long crc32_table[256] = {
static unsigned long
crc32_convert(char *buf, int len)
{
char *p;
#ifdef OSF1V4D
unsigned int crc;
#else
unsigned long crc; /* FIXME: this is not 32-bits on all platforms! */
#endif /* OSF1V4D */
unsigned char *p;
nsldapi_uint_32 crc;
crc = 0xffffffff; /* preload shift register, per CRC-32 spec */
for (p = buf; len > 0; ++p, --len)
for (p = (unsigned char *)buf; len > 0; ++p, --len)
crc = ((crc << 8) ^ crc32_table[(crc >> 24) ^ *p]) & 0xffffffff;
return (unsigned long) ~crc; /* transmit complement, per CRC-32 spec */