sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-12-07 00:00:13 -05:00
Code Issues Projects Releases Wiki Activity

solved 64 bit issue in push/pop stroke interface

Browse Source
This commit is contained in:
Andreas Steffen 2006-10-31 23:17:21 +00:00
parent 231f704548
commit 923ee10eef
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/charon/threads/stroke_interface.c
View File

@ -93,14 +93,14 @@ static void pop_string(stroke_msg_t *msg, char **string)
/* check for sanity of string pointer and string */ /* check for sanity of string pointer and string */
if (string < (char**)msg if (string < (char**)msg
|| string > (char**)msg + sizeof(stroke_msg_t) || string > (char**)msg + sizeof(stroke_msg_t)
|| (u_int)*string < (u_int)((char*)msg->buffer - (char*)msg) || (unsigned long)*string < (unsigned long)((char*)msg->buffer - (char*)msg)
|| (u_int)*string > msg->length) || (unsigned long)*string > msg->length)
{ {
*string = "(invalid pointer in stroke msg)"; *string = "(invalid pointer in stroke msg)";
} }
else else
{ {
*string = (char*)msg + (u_int)*string; *string = (char*)msg + (unsigned long)*string;
} }
} }

2
src/starter/starterstroke.c
View File

@ -64,7 +64,7 @@ enum auth_method_t {
static char* push_string(stroke_msg_t *msg, char *string) 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)) if (string == NULL || msg->length + strlen(string) >= sizeof(stroke_msg_t))
{ {

2
src/stroke/stroke.c
View File

@ -34,7 +34,7 @@ struct stroke_token {
static char* push_string(stroke_msg_t *msg, char *string) 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)) if (string == NULL || msg->length + strlen(string) >= sizeof(stroke_msg_t))
{ {