IRSA-7633 prevent strings from being misclassified as arrays in variant visitor

[sreenivasapydi]

No description provided.

[judith-ipac]

Hi, @sreenivasapydi. Looks good.

Please check whether making this change to json5_parser/json5_parser_reader_template.h addresses the compiler warnings:

@@ -140,7 +140,7 @@ String_type substitute_esc_chars(typename String_type::const_iterator begin,
                                  typename String_type::const_iterator end) {
     typedef typename String_type::const_iterator Iter_type;
 
-    if (end - begin < 2) return String_type(begin, end);
+    if (end < begin + 2) return String_type(begin, end);
 

If it looks good to you, would you mind adding this change to your branch? Thanks.

[judith-ipac]

Looks good. Please see my suggestion about addressing compiler warnings.

[judith-ipac]

p.s. It would be nice if your commit comment mentioned "Port to Debian 12".

[judith-ipac]

Just saw your second commit. Is there a reason why you chose to make that rather complicated change to json5_parser/json5_parser_reader_template.h rather than the simpler one I suggested?

[sreenivasapydi]

The replaces the earlier complex change. This is a simpler change. Generated and summarized by AI

Guard String_type(begin, end) construction with an explicit
begin >= end check so GCC can prove the range is non-negative.

The earlier changes were ai-generated too, not sure why it was complex though.

[sreenivasapydi]

used a simple code change

[sreenivasapydi]

I revised the commit and force pushed. please review now.

Hi, @sreenivasapydi. Looks good.

Please check whether making this change to json5_parser/json5_parser_reader_template.h addresses the compiler warnings:

@@ -140,7 +140,7 @@ String_type substitute_esc_chars(typename String_type::const_iterator begin,
                                  typename String_type::const_iterator end) {
     typedef typename String_type::const_iterator Iter_type;
 
-    if (end - begin < 2) return String_type(begin, end);
+    if (end < begin + 2) return String_type(begin, end);
 

If it looks good to you, would you mind adding this change to your branch? Thanks.

[sreenivasapydi]

sorry for the multiple comments, I couldn't find this line :

if (end - begin < 2) return String_type(begin, end);