fix double free bug

diff --git a/lib/findpkg.c b/lib/findpkg.c
index 865f407b4f8dc638060c636e3df70da3c7c8003d..6f69876f76915149e2e4d5b276a2477b36d98100 100644 (file)
--- a/lib/findpkg.c
+++ b/lib/findpkg.c
@@ -94,7 +94,7 @@ void zpm_sqlite_error(struct zpm *zpm) {
 
 char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
        char *select = "select pkgid, package, version, release from packages_pkgid";
 
 char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
        char *select = "select pkgid, package, version, release from packages_pkgid";

-       char *group = "group by package having max( version||'-'||release collate vercmp) order by length(package), package, version||'-'||release collate vercmp limit 1";
+       char *group = "group by package having max( version||'-'||release collate vercmp) order by length(package), package, version||'-'||release collate vercmp";

 #if 0
        char *sstr[] = {
                "status = 'installed'",
 #if 0
        char *sstr[] = {
                "status = 'installed'",


@@ -106,7 +106,7 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
 //     char *order = "order by package, version collate vercmp, cast(release as integer)";
        sqlite3_str *sql;
        sqlite3_stmt *stmt;
 //     char *order = "order by package, version collate vercmp, cast(release as integer)";
        sqlite3_str *sql;
        sqlite3_stmt *stmt;

-       char *query;
+       char *query, *pkgid;

        char package[32];
        char version[32];
        int release;
        char package[32];
        char version[32];
        int release;


@@ -132,9 +132,9 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
 
        sql = sqlite3_str_new(zpm->db);
        sqlite3_str_appendall(sql, select);
 
        sql = sqlite3_str_new(zpm->db);
        sqlite3_str_appendall(sql, select);

-       sqlite3_str_appendf(sql, " where package = %q", package);
+       sqlite3_str_appendf(sql, " where package = %Q", package);

        if (*version) {
        if (*version) {

-               sqlite3_str_appendf(sql, " and version = %q", version);
+               sqlite3_str_appendf(sql, " and version = %Q", version);

        }
        if (release) {
                sqlite3_str_appendf(sql, " and release = %d", release);
        }
        if (release) {
                sqlite3_str_appendf(sql, " and release = %d", release);


@@ -152,12 +152,16 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
        sqlite3_prepare_v2(zpm->db, query, strlen(query), &stmt, NULL);
        sqlite3_free(query);
 
        sqlite3_prepare_v2(zpm->db, query, strlen(query), &stmt, NULL);
        sqlite3_free(query);
 

-       free(zpm->pkgid);
+#if 0
+       if (zpm->pkgid) {
+               free(zpm->pkgid);
+       }

        zpm->pkgid = 0;
        zpm->pkgid = 0;

+#endif

 
        switch (sqlite3_step(stmt)) {
                case SQLITE_ROW:
 
        switch (sqlite3_step(stmt)) {
                case SQLITE_ROW:

-                       zpm->pkgid = strdup((const char *)sqlite3_column_text(stmt, 0));
+                       pkgid = strdup((const char *)sqlite3_column_text(stmt, 0));

                        break;
                case SQLITE_DONE:
                        /* not found */
                        break;
                case SQLITE_DONE:
                        /* not found */


@@ -168,5 +172,5 @@ char *zpm_findpkg(struct zpm *zpm, char *pkgstr) {
        }
        sqlite3_finalize(stmt);
 
        }
        sqlite3_finalize(stmt);
 

-       return zpm->pkgid;
+       return pkgid;

 }
 }

diff --git a/lib/script_hash.c b/lib/script_hash.c
index d4f03fafbff9f4940d645cdf2033e8ce0e25e4a0..c559e877dfbcaa3d72e3a6d0bedc9b983551764a 100644 (file)
--- a/lib/script_hash.c
+++ b/lib/script_hash.c
@@ -6,8 +6,8 @@
 #include "zpm.h"
 
 int zpm_script_hash(struct zpm *zpm, char *pkgstr, char *phase, char *hash) {
 #include "zpm.h"
 
 int zpm_script_hash(struct zpm *zpm, char *pkgstr, char *phase, char *hash) {

-       char *pkgid;
-       char *template = "select hash from scripts_pkgid where pkgid = %q and phase = %q";
+       char *pkgid = 0;
+       char *template = "select hash from scripts_pkgid where pkgid = %Q and phase = %Q";

        sqlite3_stmt *st;
 
        pkgid = zpm_findpkg(zpm, pkgstr);
        sqlite3_stmt *st;
 
        pkgid = zpm_findpkg(zpm, pkgstr);