Module: wine Branch: master Commit: 9c87c88837bb708e83792a38fe819585f4592b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c87c88837bb708e83792a38fe...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Feb 18 12:57:03 2010 +0100
server: Fix tracing of invalid ACLs.
---
server/trace.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/server/trace.c b/server/trace.c index 03e4c04..529316d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -822,7 +822,7 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz { if (size < sizeof(ACL)) { - fprintf( stderr, "<invalid acl>}\n" ); + fprintf( stderr, "<invalid acl>}" ); return; } size -= sizeof(ACL); @@ -832,10 +832,7 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz const SID *sid = NULL; data_size_t sid_size = 0;
- if (size < sizeof(ACE_HEADER)) - return; - if (size < ace->AceSize) - return; + if (size < sizeof(ACE_HEADER) || size < ace->AceSize) break; size -= ace->AceSize; if (i != 0) fputc( ',', stderr ); fprintf( stderr, "{AceType=" );