ERR: Added casts to remove type conversion warnings. Pointer differences can be 64-bit, but unsigned long is 32-bit on many platforms. We know we are not traversing more data than can be handled by an unsigned long, though, because the length argument is an unsigned long.
This commit is contained in:
parent
6b1770932e
commit
cee10ceebd
|
@ -115,7 +115,9 @@ void kwsysBase64_Encode1(const unsigned char *src, unsigned char *dest)
|
||||||
3 bytes then the extra padding needed to complete the encode 4 bytes will
|
3 bytes then the extra padding needed to complete the encode 4 bytes will
|
||||||
stop the decoding anyway). */
|
stop the decoding anyway). */
|
||||||
unsigned long kwsysBase64_Encode(const unsigned char *input,
|
unsigned long kwsysBase64_Encode(const unsigned char *input,
|
||||||
unsigned long length, unsigned char *output, int mark_end)
|
unsigned long length,
|
||||||
|
unsigned char *output,
|
||||||
|
int mark_end)
|
||||||
{
|
{
|
||||||
const unsigned char *ptr = input;
|
const unsigned char *ptr = input;
|
||||||
const unsigned char *end = input + length;
|
const unsigned char *end = input + length;
|
||||||
|
@ -154,8 +156,9 @@ unsigned long kwsysBase64_Encode(const unsigned char *input,
|
||||||
optr += 4;
|
optr += 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
return optr - output;
|
return (unsigned long)(optr - output);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------*/
|
/*--------------------------------------------------------------------------*/
|
||||||
/* Decode 4 bytes into a 3 byte string. */
|
/* Decode 4 bytes into a 3 byte string. */
|
||||||
int kwsysBase64_Decode3(const unsigned char *src, unsigned char *dest)
|
int kwsysBase64_Decode3(const unsigned char *src, unsigned char *dest)
|
||||||
|
@ -204,7 +207,9 @@ int kwsysBase64_Decode3(const unsigned char *src, unsigned char *dest)
|
||||||
without actually knowing how much decoded data to expect (of course, the
|
without actually knowing how much decoded data to expect (of course, the
|
||||||
buffer must be large enough). */
|
buffer must be large enough). */
|
||||||
unsigned long kwsysBase64_Decode(const unsigned char *input,
|
unsigned long kwsysBase64_Decode(const unsigned char *input,
|
||||||
unsigned long length, unsigned char *output, unsigned long max_input_length)
|
unsigned long length,
|
||||||
|
unsigned char *output,
|
||||||
|
unsigned long max_input_length)
|
||||||
{
|
{
|
||||||
const unsigned char *ptr = input;
|
const unsigned char *ptr = input;
|
||||||
unsigned char *optr = output;
|
unsigned char *optr = output;
|
||||||
|
@ -220,7 +225,7 @@ unsigned long kwsysBase64_Decode(const unsigned char *input,
|
||||||
optr += len;
|
optr += len;
|
||||||
if(len < 3)
|
if(len < 3)
|
||||||
{
|
{
|
||||||
return optr - output;
|
return (unsigned long)(optr - output);
|
||||||
}
|
}
|
||||||
ptr += 4;
|
ptr += 4;
|
||||||
}
|
}
|
||||||
|
@ -234,7 +239,7 @@ unsigned long kwsysBase64_Decode(const unsigned char *input,
|
||||||
optr += len;
|
optr += len;
|
||||||
if(len < 3)
|
if(len < 3)
|
||||||
{
|
{
|
||||||
return optr - output;
|
return (unsigned long)(optr - output);
|
||||||
}
|
}
|
||||||
ptr += 4;
|
ptr += 4;
|
||||||
}
|
}
|
||||||
|
@ -258,5 +263,5 @@ unsigned long kwsysBase64_Decode(const unsigned char *input,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return optr - output;
|
return (unsigned long)(optr - output);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue