diff options
| author | jbj <devnull@localhost> | 1999-12-10 15:37:41 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 1999-12-10 15:37:41 +0000 |
| commit | ff438dd50d181d25ee0029f6d1332aaea8c2bb9b (patch) | |
| tree | 5d3e08e75fb218c6d2270e9c0016d4058c446593 /lib | |
| parent | bd109d5df5c914b3b3897d0344d61bf28e2aacb9 (diff) | |
| download | rpm-ff438dd50d181d25ee0029f6d1332aaea8c2bb9b.tar.gz rpm-ff438dd50d181d25ee0029f6d1332aaea8c2bb9b.tar.bz2 rpm-ff438dd50d181d25ee0029f6d1332aaea8c2bb9b.zip | |
Back out fix for dirIndexes memory leak.
CVS patchset: 3467
CVS date: 1999/12/10 15:37:41
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rpmlib.h | 4 | ||||
| -rw-r--r-- | lib/transaction.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 790325e37..ff556e903 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -78,7 +78,7 @@ extern const struct headerSprintfExtension rpmHeaderFormats[]; #define RPMTAG_FILEMD5S 1035 #define RPMTAG_FILELINKTOS 1036 #define RPMTAG_FILEFLAGS 1037 -#define RPMTAG_ROOT 1038 +#define RPMTAG_ROOT 1038 /* obsolete */ #define RPMTAG_FILEUSERNAME 1039 #define RPMTAG_FILEGROUPNAME 1040 #define RPMTAG_EXCLUDE 1041 /* internal - depricated */ @@ -138,7 +138,7 @@ extern const struct headerSprintfExtension rpmHeaderFormats[]; #define RPMTAG_TRIGGERPOSTUN 1102 /* internal */ #define RPMTAG_AUTOREQ 1103 /* internal */ #define RPMTAG_AUTOPROV 1104 /* internal */ -#define RPMTAG_CAPABILITY 1105 +#define RPMTAG_CAPABILITY 1105 /* unused */ #define RPMTAG_SOURCEPACKAGE 1106 /* internal */ #define RPMTAG_OLDORIGFILENAMES 1107 /* obsolete */ #define RPMTAG_BUILDPREREQ 1108 /* internal */ diff --git a/lib/transaction.c b/lib/transaction.c index e56cc1905..ace8f98a0 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -94,7 +94,9 @@ static void freeFi(TFI_t *fi) if (fi->bnl) { free(fi->bnl); fi->bnl = NULL; free(fi->dnl); fi->dnl = NULL; +#ifdef DOUBLE_FREE xfree(fi->dil); fi->dil = NULL; +#endif } if (fi->flinks) { free(fi->flinks); fi->flinks = NULL; @@ -1561,7 +1563,9 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify, continue; free(fi->bnl); fi->bnl = NULL; free(fi->dnl); fi->dnl = NULL; +#ifdef DOUBLE_FREE xfree(fi->dil); fi->dil = NULL; +#endif switch (fi->type) { case TR_ADDED: free(fi->fmd5s); fi->fmd5s = NULL; |