fix possible memory leak in uncompress

diff --git a/lib/uncompress.c b/lib/uncompress.c
index cb8fed2b49b4d7a3d28e025f2e2a0f1b48bf1957..bbc1adbadfcfb3087fbbb67f0f608b8b7257dd61 100644 (file)
--- a/lib/uncompress.c
+++ b/lib/uncompress.c
@@ -78,9 +78,11 @@ ssize_t uncompresslzma(void *buf, size_t bufsize, int out) {
                                // that there's no trailing garbage.
                                assert(strm->avail_in == 0);
                                //assert(action == LZMA_FINISH);
                                // that there's no trailing garbage.
                                assert(strm->avail_in == 0);
                                //assert(action == LZMA_FINISH);

+                               lzma_end(strm);

                                return bytes;
                        }
 
                                return bytes;
                        }
 

+                       lzma_end(strm);

                        const char *msg;
                        switch (ret) {
                                case LZMA_MEM_ERROR:
                        const char *msg;
                        switch (ret) {
                                case LZMA_MEM_ERROR:

diff --git a/zpm-note.c b/zpm-note.c
index 927f30a45b8443ed6c93f92a25ae2061fdef35c7..33e7fa2a923b03de0779fefac186fa14798ca8d6 100644 (file)
--- a/zpm-note.c
+++ b/zpm-note.c
@@ -106,5 +106,8 @@ int main(int ac, char **av){
        }
        fail = pkg.error;
        zpm_close(&pkg);
        }
        fail = pkg.error;
        zpm_close(&pkg);

+       if (n.id) {
+               zpm_note_free(&n);
+       }

        return fail ? EXIT_FAILURE : EXIT_SUCCESS;
 }
        return fail ? EXIT_FAILURE : EXIT_SUCCESS;
 }

diff --git a/zpm-syncfs.c b/zpm-syncfs.c
index 0b88928d456ae875bd940a8d1fdabdf65c0f30ec..59a88256f66c0cfb963750b8119a856876ddd668 100644 (file)
--- a/zpm-syncfs.c
+++ b/zpm-syncfs.c
@@ -871,6 +871,12 @@ static int install_files(void *f, int ncols, char **vals, char **cols) {
                return conf->errabort;
        }
 
                return conf->errabort;
        }
 

+#if 0
+       int64_t used, high;
+       used = sqlite3_memory_used()/1024/1024;
+       high = sqlite3_memory_highwater(0)/1024/1024;
+       fprintf(stderr, "memory = %ld MB / %ld MB\n", used, high);
+#endif

        if (conf->verbose && !conf->dryrun) {
                fprintf(stderr, "%s '%c' %s\n", nitem.opstr, nitem.ftype,
                                nitem.dest);
        if (conf->verbose && !conf->dryrun) {
                fprintf(stderr, "%s '%c' %s\n", nitem.opstr, nitem.ftype,
                                nitem.dest);