Changeset: 0c4b9621469d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c4b9621469d
Modified Files:
sql/backends/monet5/sql.c
Branch: Oct2014
Log Message:
Fix potential memory leak.
diffs (28 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2784,15 +2784,21 @@ mvc_import_table_wrap(Client cntxt, MalB
/* convert UTF-8 encoded file name to the character set of our
* own locale before passing it on to the system call */
- if ((msg = STRcodeset(&cs)) != MAL_SUCCEED ||
- (msg = STRIconv(&filename, fname, &utf8, &cs)) != MAL_SUCCEED) {
+ if ((msg = STRcodeset(&cs)) != MAL_SUCCEED) {
GDKfree(tsep);
GDKfree(rsep);
GDKfree(ssep);
return msg;
}
-
+ msg = STRIconv(&filename, fname, &utf8, &cs);
GDKfree(cs);
+ if (msg != MAL_SUCCEED) {
+ GDKfree(tsep);
+ GDKfree(rsep);
+ GDKfree(ssep);
+ return msg;
+ }
+
len = strlen((char *) (*N));
if ((ns = GDKmalloc(len + 1)) == NULL) {
GDKfree(tsep);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
