This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Fix UB in diagnostic.c


> This should fix an undefined behavior in diagnostics.c.
> Under certain circumstances, max_width is (INT_MAX - 1),
> and right_margin is -4 -> the subtraction overflows.
> Changing the types to unsigned would involve changing
> much more code than just one cast.
>
> BTW, the diagnostics we output for the testcase in the PR
> is crap - but I'm not fixing it now.

Hi Marek,

I don't think this is the right fix. The problem is that we are trying
to print the caret in a column that is larger than the line_width. We
do this because the file given by the line directive has nothing to do
with the actual code we are parsing. I think in that case it is ok to
just give up and not print a caret. So something like:

@@ -300,11 +299,11 @@ diagnostic_show_locus (diagnostic_contex
     return;

   context->last_location = diagnostic->location;
   s = expand_location_to_spelling_point (diagnostic->location);
   line = location_get_source_line (s, &line_width);
-  if (line == NULL)
+  if (line == NULL || s.column > line_width)
     return;

   max_width = context->caret_max_width;
   line = adjust_line (line, line_width, max_width, &(s.column));

Nonetheless, perhaps in addition adjust_line should have
gcc_checking_assert(line_width >= column).

Another alternative is for location_get_source_line to check this and
return NULL in that case (since that location cannot belong to that
source line). But perhaps such behavior might be useful in other
situations (wrong column info but the file and line are correct).

Cheers,

Manuel.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]