Changeset: f6be9addd8f1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f6be9addd8f1 Modified Files: monetdb5/modules/atoms/json.c Branch: default Log Message:
Check that we are not recursing too deeply at JSON storage creation diffs (18 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 @@ -140,6 +140,14 @@ JSONtoStorageString(JSON *jt, int idx, j size_t sz = 0; str msg = MAL_SUCCEED; + if (THRhighwater()) { + msg = createException(MAL, "json.new", + SQLSTATE(42000) + "JSON object too complex to render into string."); + return msg; + } + + switch(jt->elm[idx].kind) { case JSON_OBJECT: *p++ = '{'; _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org