sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

r16299: Fix another "dereferencing type-punned pointer will break

Browse Source 
strict-aliasing rules" gcc4 warning.
Jeremy.
(This used to be commit ee77dde9b6375423f95f31455d06cef7303400be)
This commit is contained in:
Jeremy Allison 2006-06-16 20:44:49 +00:00 committed by Gerald (Jerry) Carter
parent 0a5b892aee
commit 4ba1a36d4c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/rpc_parse/parse_misc.c
View File

@ -1107,6 +1107,7 @@ BOOL smb_io_unistr2(const char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *
BOOL prs_unistr4(const char *desc, prs_struct *ps, int depth, UNISTR4 *uni4)
{
void *ptr;
prs_debug(ps, depth, desc, "prs_unistr4");
depth++;
@ -1115,9 +1116,13 @@ BOOL prs_unistr4(const char *desc, prs_struct *ps, int depth, UNISTR4 *uni4)
if ( !prs_uint16("size", ps, depth, &uni4->size ))
return False;
if ( !prs_pointer( desc, ps, depth, (void**)&uni4->string, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2 ) )
ptr = uni4->string;
if ( !prs_pointer( desc, ps, depth, &ptr, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2 ) )
return False;
uni4->string = (UNISTR2 *)ptr;
return True;
}