From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1873) id E0257384C370; Tue, 13 Dec 2022 23:05:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E0257384C370 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670972731; bh=9MEW3oyi3QsE9QnOA3I3t2bRoi3bfnyIloTYhPUqgGo=; h=From:To:Subject:Date:From; b=wbJLbVHSm5hcnZaymKGXDJFzofBy+uFGScbCaS3NDyn/+fFfcUTxHCRCDDrn2TQC7 RCWw/brKybistUbOxgDFo+WCZu8O9nBMpushxCsJbvg2hjK80bydHVz42AReahkTOR 4l3KjrMgke8VVcl+Gbo9YzwIUa8gfYHtbVBvpNYY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain Buclaw To: gcc-cvs@gcc.gnu.org Subject: [gcc r10-11119] libphobos: Fix std.path.expandTilde raising onOutOfMemory X-Act-Checkin: gcc X-Git-Author: Iain Buclaw X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: d6e258859f7346a0d91cfa7fdd32cdc7abc268e7 X-Git-Newrev: 6ac6008ad52d44b3090967ca2f8d0b4e4d9bf549 Message-Id: <20221213230531.E0257384C370@sourceware.org> Date: Tue, 13 Dec 2022 23:05:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:6ac6008ad52d44b3090967ca2f8d0b4e4d9bf549 commit r10-11119-g6ac6008ad52d44b3090967ca2f8d0b4e4d9bf549 Author: Iain Buclaw Date: Tue Dec 13 23:54:22 2022 +0100 libphobos: Fix std.path.expandTilde raising onOutOfMemory Fixes std.path.expandTilde erroneously raising onOutOfMemory after failed call to `getpwnam_r()'. libphobos/ChangeLog: * src/std/path.d (expandTilde): Handle more errno codes that could be left set by getpwnam_r. Diff: --- libphobos/src/std/path.d | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/libphobos/src/std/path.d b/libphobos/src/std/path.d index 4a435efba6c..d250953ee1c 100644 --- a/libphobos/src/std/path.d +++ b/libphobos/src/std/path.d @@ -3850,7 +3850,7 @@ string expandTilde(string inputPath) nothrow version (Posix) { import core.exception : onOutOfMemoryError; - import core.stdc.errno : errno, ERANGE; + import core.stdc.errno : errno, EBADF, ENOENT, EPERM, ERANGE, ESRCH; import core.stdc.stdlib : malloc, free, realloc; /* Joins a path from a C string to the remainder of path. @@ -3950,7 +3950,7 @@ string expandTilde(string inputPath) nothrow scope(exit) free(extra_memory); passwd result; - while (1) + loop: while (1) { extra_memory = cast(char*) realloc(extra_memory, extra_memory_size * char.sizeof); if (extra_memory == null) @@ -3969,10 +3969,23 @@ string expandTilde(string inputPath) nothrow break; } - if (errno != ERANGE && + switch (errno) + { + case ERANGE: // On BSD and OSX, errno can be left at 0 instead of set to ERANGE - errno != 0) - onOutOfMemoryError(); + case 0: + break; + + case ENOENT: + case ESRCH: + case EBADF: + case EPERM: + // The given name or uid was not found. + break loop; + + default: + onOutOfMemoryError(); + } // extra_memory isn't large enough import core.checkedint : mulu;