From ac468059e615b6b889e2d4f511539fe4395a2a53 Mon Sep 17 00:00:00 2001 From: CaS Date: Fri, 10 May 2002 06:39:10 +0000 Subject: [PATCH] Fix some assertions. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13614 72102866-910b-0410-8b05-ffd578937521 --- Source/NSTask.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/NSTask.m b/Source/NSTask.m index 0f55cfef4..7306ac0cb 100644 --- a/Source/NSTask.m +++ b/Source/NSTask.m @@ -501,13 +501,13 @@ pty_slave(const char* name) */ - (void) setStandardError: (id)hdl { - NSAssert([hdl isKindOfClass: [NSFileHandle class]] || - [hdl isKindOfClass: [NSPipe class]], NSInvalidArgumentException); if (_hasLaunched) { [NSException raise: NSInvalidArgumentException format: @"NSTask - task has been launched"]; } + NSAssert(hdl != nil && ([hdl isKindOfClass: [NSFileHandle class]] || + [hdl isKindOfClass: [NSPipe class]]), NSInvalidArgumentException); ASSIGN(_standardError, hdl); } @@ -523,13 +523,13 @@ pty_slave(const char* name) */ - (void) setStandardInput: (id)hdl { - NSAssert([hdl isKindOfClass: [NSFileHandle class]] || - [hdl isKindOfClass: [NSPipe class]], NSInvalidArgumentException); if (_hasLaunched) { [NSException raise: NSInvalidArgumentException format: @"NSTask - task has been launched"]; } + NSAssert(hdl != nil && ([hdl isKindOfClass: [NSFileHandle class]] || + [hdl isKindOfClass: [NSPipe class]]), NSInvalidArgumentException); ASSIGN(_standardInput, hdl); } @@ -545,13 +545,13 @@ pty_slave(const char* name) */ - (void) setStandardOutput: (id)hdl { - NSAssert([hdl isKindOfClass: [NSFileHandle class]] || - [hdl isKindOfClass: [NSPipe class]], NSInvalidArgumentException); if (_hasLaunched) { [NSException raise: NSInvalidArgumentException format: @"NSTask - task has been launched"]; } + NSAssert(hdl != nil && ([hdl isKindOfClass: [NSFileHandle class]] || + [hdl isKindOfClass: [NSPipe class]]), NSInvalidArgumentException); ASSIGN(_standardOutput, hdl); }