diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-15 11:45:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-15 11:45:42 (GMT) |
| commit | f2f41b4b85e855ef94dbfcd86d4e9d6cc7ae14b1 (patch) | |
| tree | aeba4a36d910a2368f0c763072692b6d6de70023 /compat | |
| parent | 36cebb89fe04bab244acd87f76950ec68ec3b946 (diff) | |
| parent | db43c8cbed9e1d40d644e2ecb9112606d4a528bd (diff) | |
| download | tcl-f2f41b4b85e855ef94dbfcd86d4e9d6cc7ae14b1.zip tcl-f2f41b4b85e855ef94dbfcd86d4e9d6cc7ae14b1.tar.gz tcl-f2f41b4b85e855ef94dbfcd86d4e9d6cc7ae14b1.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/opendir.c | 2 | ||||
| -rw-r--r-- | compat/waitpid.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/compat/opendir.c b/compat/opendir.c index 25a7ada..b9e7166 100644 --- a/compat/opendir.c +++ b/compat/opendir.c @@ -28,7 +28,7 @@ opendir( if ((fd = open(myname, 0, 0)) == -1) { return NULL; } - dirp = (DIR *) ckalloc(sizeof(DIR)); + dirp = (DIR *) attemptckalloc(sizeof(DIR)); if (dirp == NULL) { /* unreachable? */ close(fd); diff --git a/compat/waitpid.c b/compat/waitpid.c index 626d210..ec03cab 100644 --- a/compat/waitpid.c +++ b/compat/waitpid.c @@ -156,7 +156,11 @@ waitpid( goto waitAgain; } } - waitPtr = (WaitInfo *) ckalloc(sizeof(WaitInfo)); + waitPtr = (WaitInfo *) attemptckalloc(sizeof(WaitInfo)); + if (!waitPtr) { + errno = ENOMEM; + return -1; + } waitPtr->pid = result; waitPtr->status = status; waitPtr->nextPtr = deadList; |