From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Tue, 13 Dec 2022 22:54:22 +0000 (+0100)
Subject: libphobos: Fix std.path.expandTilde raising onOutOfMemory
X-Git-Tag: releases/gcc-10.5.0~373
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ac6008ad52d44b3090967ca2f8d0b4e4d9bf549;p=thirdparty%2Fgcc.git

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 --git a/libphobos/src/std/path.d b/libphobos/src/std/path.d
index 4a435efba6c2..d250953ee1c3 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;