Move checkStringLen() to convertJsonbScalar()

Nikita Glukhov · Nikita Glukhov · commit 7ad2220c8c5b · 2017-05-02T21:38:28.000+03:00
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -68,7 +68,6 @@ typedef struct JsonbAggState
 } JsonbAggState;
 
 static inline Datum jsonb_from_cstring(char *json, int len);
-static size_t checkStringLen(size_t len);
 static void jsonb_in_object_start(void *pstate);
 static void jsonb_in_object_end(void *pstate);
 static void jsonb_in_array_start(void *pstate);
@@ -255,18 +254,6 @@ jsonb_from_cstring(char *json, int len)
 	PG_RETURN_JSONB(JsonbValueToJsonb(state.res));
 }
 
-static size_t
-checkStringLen(size_t len)
-{
-	if (len > JENTRY_OFFLENMASK)
-		ereport(ERROR,
-				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("string too long to represent as jsonb string"),
-				 errdetail("Due to an implementation restriction, jsonb strings cannot exceed %d bytes.",
-						   JENTRY_OFFLENMASK)));
-
-	return len;
-}
 
 static void
 jsonb_in_object_start(void *pstate)
@@ -308,7 +295,7 @@ jsonb_in_object_field_start(void *pstate, char *fname, bool isnull)
 
 	Assert(fname != NULL);
 	v.type = jbvString;
-	v.val.string.len = checkStringLen(strlen(fname));
+	v.val.string.len = strlen(fname);
 	v.val.string.val = fname;
 
 	_state->res = pushJsonbValue(&_state->parseState, WJB_KEY, &v);
@@ -357,7 +344,7 @@ jsonb_in_scalar(void *pstate, char *token, JsonTokenType tokentype)
 		case JSON_TOKEN_STRING:
 			Assert(token != NULL);
 			v.type = jbvString;
-			v.val.string.len = checkStringLen(strlen(token));
+			v.val.string.len = strlen(token);
 			v.val.string.val = token;
 			break;
 		case JSON_TOKEN_NUMBER:
@@ -899,7 +886,7 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 			default:
 				outputstr = OidOutputFunctionCall(outfuncoid, val);
 				jb.type = jbvString;
-				jb.val.string.len = checkStringLen(strlen(outputstr));
+				jb.val.string.len = strlen(outputstr);
 				jb.val.string.val = outputstr;
 				break;
 		}
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -1776,7 +1776,15 @@ convertJsonbScalar(StringInfo buffer, JEntry *jentry, const JsonbValue *scalarVa
 			break;
 
 		case jbvString:
-			appendToBuffer(buffer, scalarVal->val.string.val, scalarVal->val.string.len);
+			if (scalarVal->val.string.len > JENTRY_OFFLENMASK)
+					ereport(ERROR,
+							(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+							 errmsg("string too long to represent as jsonb string"),
+							 errdetail("Due to an implementation restriction, jsonb strings cannot exceed %d bytes.",
+									   JENTRY_OFFLENMASK)));
+
+			appendToBuffer(buffer, scalarVal->val.string.val,
+							scalarVal->val.string.len);
 
 			*jentry = scalarVal->val.string.len;
 			break;
