moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

endian: Fixed bit-shift in 64-bit integer read functions

Browse Source 
From commit 43792592ca and 4bb5a351b2.

Reported-by: Michael Osipov
This commit is contained in:
Steve Holme 2015-01-02 15:53:42 +00:00
parent a3daf542ad
commit a75ede4b9b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/curl_endian.c
View File

@ -85,7 +85,7 @@ unsigned long long Curl_read64_le(unsigned char *buf)
((unsigned long long)buf[4] << 32) | ((unsigned long long)buf[4] << 32) |
((unsigned long long)buf[5] << 40) | ((unsigned long long)buf[5] << 40) |
((unsigned long long)buf[6] << 48) | ((unsigned long long)buf[6] << 48) |
((unsigned long long)buf[7] << 54); ((unsigned long long)buf[7] << 56);
} }
#else #else
unsigned __int64 Curl_read64_le(unsigned char *buf) unsigned __int64 Curl_read64_le(unsigned char *buf)
@ -93,7 +93,7 @@ unsigned __int64 Curl_read64_le(unsigned char *buf)
return ((unsigned __int64)buf[0]) | ((unsigned __int64)buf[1] << 8) | return ((unsigned __int64)buf[0]) | ((unsigned __int64)buf[1] << 8) |
((unsigned __int64)buf[2] << 16) | ((unsigned __int64)buf[3] << 24) | ((unsigned __int64)buf[2] << 16) | ((unsigned __int64)buf[3] << 24) |
((unsigned __int64)buf[4] << 32) | ((unsigned __int64)buf[5] << 40) | ((unsigned __int64)buf[4] << 32) | ((unsigned __int64)buf[5] << 40) |
((unsigned __int64)buf[6] << 48) | ((unsigned __int64)buf[7] << 54); ((unsigned __int64)buf[6] << 48) | ((unsigned __int64)buf[7] << 56);
} }
#endif #endif
@ -151,7 +151,7 @@ unsigned int Curl_read32_be(unsigned char *buf)
#if defined(HAVE_LONGLONG) #if defined(HAVE_LONGLONG)
unsigned long long Curl_read64_be(unsigned char *buf) unsigned long long Curl_read64_be(unsigned char *buf)
{ {
return ((unsigned long long)buf[0] << 54) | return ((unsigned long long)buf[0] << 56) |
((unsigned long long)buf[1] << 48) | ((unsigned long long)buf[1] << 48) |
((unsigned long long)buf[2] << 40) | ((unsigned long long)buf[2] << 40) |
((unsigned long long)buf[3] << 32) | ((unsigned long long)buf[3] << 32) |
@ -163,7 +163,7 @@ unsigned long long Curl_read64_be(unsigned char *buf)
#else #else
unsigned __int64 Curl_read64_be(unsigned char *buf) unsigned __int64 Curl_read64_be(unsigned char *buf)
{ {
return ((unsigned __int64)buf[0] << 54) | ((unsigned __int64)buf[1] << 48) | return ((unsigned __int64)buf[0] << 56) | ((unsigned __int64)buf[1] << 48) |
((unsigned __int64)buf[2] << 40) | ((unsigned __int64)buf[3] << 32) | ((unsigned __int64)buf[2] << 40) | ((unsigned __int64)buf[3] << 32) |
((unsigned __int64)buf[4] << 24) | ((unsigned __int64)buf[5] << 16) | ((unsigned __int64)buf[4] << 24) | ((unsigned __int64)buf[5] << 16) |
((unsigned __int64)buf[6] << 8) | ((unsigned __int64)buf[7]); ((unsigned __int64)buf[6] << 8) | ((unsigned __int64)buf[7]);