From: pawelk <pawelk@pld-linux.org>
Date: Wed, 1 Aug 2001 22:14:36 +0000 (+0000)
Subject: - bugfix
X-Git-Tag: rpm-4_0_2-30~8
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=4722c9c9f4b32b0fdc983e594f38239aedf9eb2a;hp=1120409bb915c9eea7cc20dddaa2ab7292c4d1c2;p=packages%2Frpm.git

- bugfix

Changed files:
    rpm-fast-alAddPackage.patch -> 1.4
---

diff --git a/rpm-fast-alAddPackage.patch b/rpm-fast-alAddPackage.patch
index 1f85804..05b4672 100644
--- a/rpm-fast-alAddPackage.patch
+++ b/rpm-fast-alAddPackage.patch
@@ -1,6 +1,6 @@
---- ./lib/depends.c.org	Mon Jun 25 17:59:49 2001
-+++ ./lib/depends.c	Mon Jun 25 18:04:00 2001
-@@ -335,18 +335,21 @@
+--- ./lib/depends.c~org	Wed Aug  1 22:14:31 2001
++++ ./lib/depends.c	Wed Aug  1 22:15:57 2001
+@@ -335,18 +335,24 @@
  	for (dirNum = 0; dirNum < numDirs; dirNum++) {
  	    dirNeedle.dirName = (char *) dirNames[dirNum];
  	    dirNeedle.dirNameLen = strlen(dirNames[dirNum]);
@@ -25,13 +25,16 @@
 +		dirMatch->files = NULL;
 +		dirMatch->numFiles = 0;
  		al->numDirs++;
++		for(i=0;i<dirNum;i++)
++			if(dirMapping[i] >= dirMatch - al->dirs)
++				dirMapping[i]++;
  	    }
 +	    dirMapping[dirNum] = dirMatch - al->dirs;
 +	
  	}
  
  	free(dirNames);
-@@ -374,9 +377,6 @@
+@@ -374,9 +380,6 @@
  
  	    first = last + 1;
  	}
@@ -41,8 +44,8 @@
  
      }
  
---- ./lib/misc.c.org	Mon Jun 25 17:59:49 2001
-+++ ./lib/misc.c	Mon Jun 25 18:04:36 2001
+--- ./lib/misc.c~org	Wed Aug  1 22:14:31 2001
++++ ./lib/misc.c	Wed Aug  1 22:13:33 2001
 @@ -869,3 +869,39 @@
  		&pEVR, 1);
      }
@@ -77,14 +80,14 @@
 +      else
 +	return (void *) p;
 +    }
-+  if((long)l > (long)nmemb-1)
++  if(nmemb == 0 || l > nmemb-1)
 +	  return NULL;
 +  p = (void *) (((const char *) base) + (l * size));
 +  return (void *)p;
 +}
 +
---- ./lib/misc.h.org	Mon Jun 25 17:59:49 2001
-+++ ./lib/misc.h	Mon Jun 25 18:01:53 2001
+--- ./lib/misc.h~org	Wed Aug  1 22:14:31 2001
++++ ./lib/misc.h	Wed Aug  1 22:13:33 2001
 @@ -102,6 +102,12 @@
   */
  void providePackageNVR(Header h);