mirror of
https://github.com/strongswan/strongswan.git
synced 2025-12-06 00:00:10 -05:00
solved 64 bit issue in push/pop stroke interface
This commit is contained in:
parent
231f704548
commit
923ee10eef
@ -93,14 +93,14 @@ static void pop_string(stroke_msg_t *msg, char **string)
|
||||
/* check for sanity of string pointer and string */
|
||||
if (string < (char**)msg
|
||||
|| string > (char**)msg + sizeof(stroke_msg_t)
|
||||
|| (u_int)*string < (u_int)((char*)msg->buffer - (char*)msg)
|
||||
|| (u_int)*string > msg->length)
|
||||
|| (unsigned long)*string < (unsigned long)((char*)msg->buffer - (char*)msg)
|
||||
|| (unsigned long)*string > msg->length)
|
||||
{
|
||||
*string = "(invalid pointer in stroke msg)";
|
||||
}
|
||||
else
|
||||
{
|
||||
*string = (char*)msg + (u_int)*string;
|
||||
*string = (char*)msg + (unsigned long)*string;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -64,7 +64,7 @@ enum auth_method_t {
|
||||
|
||||
static char* push_string(stroke_msg_t *msg, char *string)
|
||||
{
|
||||
u_int string_start = msg->length;
|
||||
unsigned long string_start = msg->length;
|
||||
|
||||
if (string == NULL || msg->length + strlen(string) >= sizeof(stroke_msg_t))
|
||||
{
|
||||
|
||||
@ -34,7 +34,7 @@ struct stroke_token {
|
||||
|
||||
static char* push_string(stroke_msg_t *msg, char *string)
|
||||
{
|
||||
u_int string_start = msg->length;
|
||||
unsigned long string_start = msg->length;
|
||||
|
||||
if (string == NULL || msg->length + strlen(string) >= sizeof(stroke_msg_t))
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user