Changeset: 70c99ddf7237 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70c99ddf7237
Modified Files:
monetdb5/modules/atoms/json.c
Branch: default
Log Message:
Revert "Reintroduce "Do not interpret strings before JSON parsing""
This commit was introduced by mistake in the default branch
diffs (19 lines):
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -125,7 +125,14 @@ JSONfromString(const char *src, size_t *
return -1;
*len = slen + 1;
}
- strcpy(*j, src);
+ if (external) {
+ if (GDKstrFromStr((unsigned char *) *j,
+ (const unsigned char *) src,
(ssize_t) slen) < 0)
+ return -1;
+ src = *j;
+ } else {
+ strcpy(*j, src);
+ }
jt = JSONparse(*j);
if (jt == NULL)
return -1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
