Changeset: d7c91b2488db for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d7c91b2488db
Modified Files:
common/stream/stream.c
Branch: default
Log Message:
Make sure converted string is 0 terminated.
diffs (27 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -301,15 +301,17 @@ cvfilename(const char *filename)
size_t len = strlen(filename);
size_t size = 4 * len;
ICONV_CONST char *from = (ICONV_CONST char *) filename;
- char *r = malloc(size);
+ char *r = malloc(size + 1);
char *p = r;
- if (r &&
- iconv(cd, &from, &len, &p, &size) != (size_t) -1) {
- iconv_close(cd);
- return r;
- } else if (r)
+ if (r) {
+ if (iconv(cd, &from, &len, &p, &size) !=
(size_t) -1) {
+ iconv_close(cd);
+ *p = 0;
+ return r;
+ }
free(r);
+ }
iconv_close(cd);
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
