Fix infinite recursion on non-ERANGE return from getcwd() during install.

CVS patchset: 2245
CVS date: 1998/08/15 14:04:57

diff --git a/CHANGES b/CHANGES
index 9e21fec..a66bcbf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,8 @@
        - create /usr/lib/rpm directory and move rpmrc et al there
 
 2.5.2 -> 2.5.3:
+       - fix infinite recursion on non-ERANGE return from getcwd() during
+         install.
        - rm .depend for multiple builds in same tree (Will Partain)
        - add special case code for "/" in %files.
        - better query semantics with symlinks (Tim Mooney)

diff --git a/lib/install.c b/lib/install.c
index 7e932b9..39a9fc3 100644 (file)
--- a/lib/install.c
+++ b/lib/install.c
@@ -598,7 +598,7 @@ int rpmInstallPackage(char * rootdir, rpmdb db, int fd,
     if (rootdir) {
        currDirLen = 50;
        currDir = malloc(currDirLen);
-       while (!getcwd(currDir, currDirLen)) {
+       while (!getcwd(currDir, currDirLen) && errno == ERANGE) {
            currDirLen += 50;
            currDir = realloc(currDir, currDirLen);
        }