@@ -128,9 +128,9 @@ multirange_in(PG_FUNCTION_ARGS)
128128MultirangeType * ret ;
129129MultirangeParseState parse_state ;
130130const char * ptr = input_str ;
131- const char * range_str = NULL ;
131+ const char * range_str_begin = NULL ;
132132int32 range_str_len ;
133- char * range_str_copy ;
133+ char * range_str ;
134134
135135cache = get_multirange_io_data (fcinfo ,mltrngtypoid ,IOFunc_input );
136136rangetyp = cache -> typcache -> rngtype ;
@@ -170,7 +170,7 @@ multirange_in(PG_FUNCTION_ARGS)
170170case MULTIRANGE_BEFORE_RANGE :
171171if (ch == '[' || ch == '(' )
172172{
173- range_str = ptr ;
173+ range_str_begin = ptr ;
174174parse_state = MULTIRANGE_IN_RANGE ;
175175}
176176else if (ch == '}' && ranges_seen == 0 )
@@ -191,14 +191,10 @@ multirange_in(PG_FUNCTION_ARGS)
191191errdetail ("Expected range start." )));
192192break ;
193193case MULTIRANGE_IN_RANGE :
194- if (ch == '"' )
195- parse_state = MULTIRANGE_IN_RANGE_QUOTED ;
196- else if (ch == '\\' )
197- parse_state = MULTIRANGE_IN_RANGE_ESCAPED ;
198- else if (ch == ']' || ch == ')' )
194+ if (ch == ']' || ch == ')' )
199195{
200- range_str_len = ptr - range_str + 1 ;
201- range_str_copy = pnstrdup (range_str ,range_str_len );
196+ range_str_len = ptr - range_str_begin + 1 ;
197+ range_str = pnstrdup (range_str_begin ,range_str_len );
202198if (range_capacity == range_count )
203199{
204200range_capacity *=2 ;
@@ -207,18 +203,30 @@ multirange_in(PG_FUNCTION_ARGS)
207203}
208204ranges_seen ++ ;
209205range = DatumGetRangeTypeP (InputFunctionCall (& cache -> typioproc ,
210- range_str_copy ,
206+ range_str ,
211207cache -> typioparam ,
212208typmod ));
213209if (!RangeIsEmpty (range ))
214210ranges [range_count ++ ]= range ;
215211parse_state = MULTIRANGE_AFTER_RANGE ;
216212}
217213else
218- /* include it in range_str */ ;
214+ {
215+ if (ch == '"' )
216+ parse_state = MULTIRANGE_IN_RANGE_QUOTED ;
217+ else if (ch == '\\' )
218+ parse_state = MULTIRANGE_IN_RANGE_ESCAPED ;
219+ /*
220+ * We will include this character into range_str once we
221+ * find the end of the range value.
222+ */
223+ }
219224break ;
220225case MULTIRANGE_IN_RANGE_ESCAPED :
221- /* include it in range_str */
226+ /*
227+ * We will include this character into range_str once we find
228+ * the end of the range value.
229+ */
222230parse_state = MULTIRANGE_IN_RANGE ;
223231break ;
224232case MULTIRANGE_IN_RANGE_QUOTED :
@@ -232,8 +240,11 @@ multirange_in(PG_FUNCTION_ARGS)
232240parse_state = MULTIRANGE_IN_RANGE ;
233241else if (ch == '\\' )
234242parse_state = MULTIRANGE_IN_RANGE_QUOTED_ESCAPED ;
235- else
236- /* include it in range_str */ ;
243+
244+ /*
245+ * We will include this character into range_str once we
246+ * find the end of the range value.
247+ */
237248break ;
238249case MULTIRANGE_AFTER_RANGE :
239250if (ch == ',' )
@@ -248,7 +259,10 @@ multirange_in(PG_FUNCTION_ARGS)
248259errdetail ("Expected comma or end of multirange." )));
249260break ;
250261case MULTIRANGE_IN_RANGE_QUOTED_ESCAPED :
251- /* include it in range_str */
262+ /*
263+ * We will include this character into range_str once we find
264+ * the end of the range value.
265+ */
252266parse_state = MULTIRANGE_IN_RANGE_QUOTED ;
253267break ;
254268default :