Changeset: 867718753fd6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=867718753fd6
Modified Files:
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
Branch: Jul2012
Log Message:
removeRemoteDB: fix invalid read (use of rdb after free(rdb))
diffs (23 lines):
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -695,7 +695,7 @@ static void ctl_handle_client(
} else if (strcmp(p, "status") == 0) {
sabdb *stats;
sabdb *topdb;
- char *sdb;
+ char *sdb = NULL;
if (strcmp(q, "#all") == 0)
/* list all */
diff --git a/tools/merovingian/daemon/discoveryrunner.c
b/tools/merovingian/daemon/discoveryrunner.c
--- a/tools/merovingian/daemon/discoveryrunner.c
+++ b/tools/merovingian/daemon/discoveryrunner.c
@@ -89,6 +89,7 @@ removeRemoteDB(const char *dbname, const
free(rdb->conn);
free(rdb->fullname);
free(rdb);
+ rdb = prv;
hadmatch = 1;
/* in the future, there may be more, so keep looking */
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
