Changeset: 29cd168cd338 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29cd168cd338
Modified Files:
clients/ChangeLog.Oct2010
clients/src/mapiclient/mclient.c
Branch: Oct2010
Log Message:
Fix crash when the server disconnects during \d query
diffs (36 lines):
diff -r a4e5d1b9d039 -r 29cd168cd338 clients/ChangeLog.Oct2010
--- a/clients/ChangeLog.Oct2010 Thu Oct 28 14:15:27 2010 +0200
+++ b/clients/ChangeLog.Oct2010 Thu Oct 28 15:01:15 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Thu Oct 28 2010 Fabian Groffen <fab...@cwi.nl>
+- Fix crash when the server disconnects during \d query
+
* Wed Oct 27 2010 Sjoerd Mullender <sjo...@acm.org>
- A manual page for the msqldump program was added.
- Mclient now recognizes the file name "-" to refer to its standard
diff -r a4e5d1b9d039 -r 29cd168cd338 clients/src/mapiclient/mclient.c
--- a/clients/src/mapiclient/mclient.c Thu Oct 28 14:15:27 2010 +0200
+++ b/clients/src/mapiclient/mclient.c Thu Oct 28 15:01:15 2010 +0200
@@ -1968,7 +1968,8 @@
"AND
\"s\".\"name\" = \"current_schema\" "
"AND
\"t\".\"system\" = false "
"ORDER BY
\"t\".\"name\"")) != NULL &&
- mapi_error(mid) == MOK) {
+ mapi_error(mid)
== MOK)
+ {
char *type, *name,
*schema;
while (fetch_row(hdl)
== 3) {
name =
mapi_fetch_field(hdl, 0);
@@ -1980,7 +1981,8 @@
schema, name);
}
}
- mapi_close_handle(hdl);
+ if (hdl != NULL)
+ mapi_close_handle(hdl);
hdl = NULL;
}
continue;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
