r10656: BIG merge from trunk. Features not copied over

[tprouty/samba.git] / source3 / libsmb / ntlmssp_parse.c

diff --git a/source3/libsmb/ntlmssp_parse.c b/source3/libsmb/ntlmssp_parse.c
index 4b3043aec8076ddf8a63d5cf8e4ecc228d87e9d1..e71504867e956cf32a8c3b4841f767b10b8ffbf6 100644 (file)
--- a/source3/libsmb/ntlmssp_parse.c
+++ b/source3/libsmb/ntlmssp_parse.c
@@ -216,7 +216,7 @@ BOOL msrpc_parse(const DATA_BLOB *blob,
                                        /* if odd length and unicode */
                                        return False;
                                }
-                               if (blob->data + ptr < (uint8 *)ptr || blob->data + ptr < blob->data)
+                               if (blob->data + ptr < (uint8 *)(unsigned long)ptr || blob->data + ptr < blob->data)
                                        return False;
 
                                if (0 < len1) {
@@ -244,7 +244,7 @@ BOOL msrpc_parse(const DATA_BLOB *blob,
                                        return False;
                                }
 
-                               if (blob->data + ptr < (uint8 *)ptr || blob->data + ptr < blob->data)
+                               if (blob->data + ptr < (uint8 *)(unsigned long)ptr || blob->data + ptr < blob->data)
                                        return False;   
 
                                if (0 < len1) {
@@ -272,7 +272,7 @@ BOOL msrpc_parse(const DATA_BLOB *blob,
                                        return False;
                                }
 
-                               if (blob->data + ptr < (uint8 *)ptr || blob->data + ptr < blob->data)
+                               if (blob->data + ptr < (uint8 *)(unsigned long)ptr || blob->data + ptr < blob->data)
                                        return False;   
                        
                                *b = data_blob(blob->data + ptr, len1);