fixed misc memory leaks

CVS patchset: 2108
CVS date: 1998/05/05 23:12:17

diff --git a/lib/depends.c b/lib/depends.c
index f980314..911b4cf 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -867,6 +867,9 @@ static int addOrderedPack(rpmDependencies rpmdep,
                if (rc) return 1;
            }
        }
+
+       free(requires);
+       free(requiresVersion);
     }
 
     /* whew -- add this package */

diff --git a/lib/install.c b/lib/install.c
index b92cf98..6c03ba6 100644 (file)
--- a/lib/install.c
+++ b/lib/install.c
@@ -315,8 +315,8 @@ static int assembleFileList(Header h, struct fileMemory * mem,
     headerGetEntry(h, RPMTAG_FILEMODES, NULL, (void **) &fileModes, NULL);
     headerGetEntry(h, RPMTAG_FILESIZES, NULL, (void **) &fileSizes, NULL);
     headerGetEntry(h, RPMTAG_FILELINKTOS, NULL, (void **) &mem->links, NULL);
-    languages = NULL;
-    headerGetEntry(h, RPMTAG_FILELANGS, NULL, (void **) &fileLangs, NULL);
+    if (!headerGetEntry(h, RPMTAG_FILELANGS, NULL, (void **) &fileLangs, NULL))
+       fileLangs = NULL;
 
     if ((chptr = getenv("LINGUAS"))) {
        languages = splitString(chptr, strlen(chptr), ':');
@@ -347,6 +347,9 @@ static int assembleFileList(Header h, struct fileMemory * mem,
        }
     }
 
+    if (fileLangs) free(fileLangs);
+    if (languages) freeSplitString(languages);
+
     return 0;
 }
 
@@ -418,6 +421,9 @@ static void trimChangelog(Header h) {
                      numToKeep);
     headerModifyEntry(h, RPMTAG_CHANGELOGTEXT, RPM_STRING_ARRAY_TYPE, texts, 
                      numToKeep);
+
+    free(names);
+    free(texts);
 }
 
 /* 0 success */
@@ -721,7 +727,7 @@ int rpmInstallPackage(char * rootdir, rpmdb db, int fd,
            }
        }
 
-       if (netsharedPaths) free(netsharedPaths);
+       if (netsharedPaths) freeSplitString(netsharedPaths);
 
        rc = instHandleSharedFiles(db, otherOffset, files, fileCount, 
                                   toRemove, &replacedList, flags);
@@ -1015,6 +1021,7 @@ static int installArchive(int fd, struct fileInfo * files,
                            ((notify && archiveSize) || specFile) ? 
                                callback : NULL, 
                            &info, &failedFile);
+    gzclose(stream);
 
     if (rc) {
        /* this would probably be a good place to check if disk space