upstream/mercurial-mirror Files · mercurial/bitmanipulation.h

statichttprepo: fix `httprangereader.read()` for py3...

statichttprepo: fix `httprangereader.read()` for py3 It looks like there were a bunch of problems, not all of them py3 related: 1) The signature of BinaryIO.read() is -1, not None 2) The `end` variable can't be bytes and interpolate into str with "%s" 3) The `end` variable can't be an int and interpolate into str with "%s" 4) The result slicing could be out of bounds if more is requested than returned I guess if somebody would have called `read(-1)` (either directly or because a wrapper defaults to that), it wouldn't have been handled correctly. The fact that it is a valid value meaning to read everything requires some additional changes later in the method around when it slices the byte string that was read, but that seems to have already been broken.

David Demelier - - Load All Authors

File last commit:

r49095:d8690805 default


                r52792:e26a0856

default

Download file

             bitmanipulation.h
        
                    77 lines
            
             | 1.7 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / bitmanipulation.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #ifndef HG_BITMANIPULATION_H

      #define HG_BITMANIPULATION_H

      #include <string.h>

      #include "compat.h"

      /* Reads a 64 bit integer from big-endian bytes. Assumes that the data is long

       enough */

      static inline uint64_t getbe64(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	return ((((uint64_t)d[0]) << 56) | (((uint64_t)d[1]) << 48) |

      	        (((uint64_t)d[2]) << 40) | (((uint64_t)d[3]) << 32) |

      	        (((uint64_t)d[4]) << 24) | (((uint64_t)d[5]) << 16) |

      	        (((uint64_t)d[6]) << 8) | (d[7]));

      }

      static inline uint32_t getbe32(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	return ((((uint32_t)d[0]) << 24) | (((uint32_t)d[1]) << 16) |

      	        (((uint32_t)d[2]) << 8) | (d[3]));

      }

      static inline int16_t getbeint16(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	return ((d[0] << 8) | (d[1]));

      }

      static inline uint16_t getbeuint16(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	return ((d[0] << 8) | (d[1]));

      }

      /* Writes a 64 bit integer to bytes in a big-endian format.

       Assumes that the buffer is long enough */

      static inline void putbe64(uint64_t x, char *c)

      {

      	c[0] = (x >> 56) & 0xff;

      	c[1] = (x >> 48) & 0xff;

      	c[2] = (x >> 40) & 0xff;

      	c[3] = (x >> 32) & 0xff;

      	c[4] = (x >> 24) & 0xff;

      	c[5] = (x >> 16) & 0xff;

      	c[6] = (x >> 8) & 0xff;

      	c[7] = (x)&0xff;

      }

      static inline void putbe32(uint32_t x, char *c)

      {

      	c[0] = (x >> 24) & 0xff;

      	c[1] = (x >> 16) & 0xff;

      	c[2] = (x >> 8) & 0xff;

      	c[3] = (x)&0xff;

      }

      static inline double getbefloat64(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	double ret;

      	int i;

      	uint64_t t = 0;

      	for (i = 0; i < 8; i++) {

      		t = (t << 8) + d[i];

      	}

      	memcpy(&ret, &t, sizeof(t));

      	return ret;

      }

      #endif

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#ifndef HG_BITMANIPULATION_H
				#define HG_BITMANIPULATION_H

				#include <string.h>

				#include "compat.h"

				/* Reads a 64 bit integer from big-endian bytes. Assumes that the data is long
				enough */
				static inline uint64_t getbe64(const char *c)
				{
				const unsigned char d = (const unsigned char )c;

				return ((((uint64_t)d[0]) << 56) \| (((uint64_t)d[1]) << 48) \|
				(((uint64_t)d[2]) << 40) \| (((uint64_t)d[3]) << 32) \|
				(((uint64_t)d[4]) << 24) \| (((uint64_t)d[5]) << 16) \|
				(((uint64_t)d[6]) << 8) \| (d[7]));
				}

				static inline uint32_t getbe32(const char *c)
				{
				const unsigned char d = (const unsigned char )c;

				return ((((uint32_t)d[0]) << 24) \| (((uint32_t)d[1]) << 16) \|
				(((uint32_t)d[2]) << 8) \| (d[3]));
				}

				static inline int16_t getbeint16(const char *c)
				{
				const unsigned char d = (const unsigned char )c;

				return ((d[0] << 8) \| (d[1]));
				}

				static inline uint16_t getbeuint16(const char *c)
				{
				const unsigned char d = (const unsigned char )c;

				return ((d[0] << 8) \| (d[1]));
				}

				/* Writes a 64 bit integer to bytes in a big-endian format.
				Assumes that the buffer is long enough */
				static inline void putbe64(uint64_t x, char *c)
				{
				c[0] = (x >> 56) & 0xff;
				c[1] = (x >> 48) & 0xff;
				c[2] = (x >> 40) & 0xff;
				c[3] = (x >> 32) & 0xff;
				c[4] = (x >> 24) & 0xff;
				c[5] = (x >> 16) & 0xff;
				c[6] = (x >> 8) & 0xff;
				c[7] = (x)&0xff;
				}

				static inline void putbe32(uint32_t x, char *c)
				{
				c[0] = (x >> 24) & 0xff;
				c[1] = (x >> 16) & 0xff;
				c[2] = (x >> 8) & 0xff;
				c[3] = (x)&0xff;
				}

				static inline double getbefloat64(const char *c)
				{
				const unsigned char d = (const unsigned char )c;
				double ret;
				int i;
				uint64_t t = 0;
				for (i = 0; i < 8; i++) {
				t = (t << 8) + d[i];
				}
				memcpy(&ret, &t, sizeof(t));
				return ret;
				}

				#endif