Corrects the broken line number incrementation in the Windows resource parser

When the tokens MCLINE, MCENDLINE, and MCCOMMENT were created, the
line number was not increased, which led to an incorrect value in
the error output.

	PR 26088
	* mclex.c (skip_until_eol): if eol was found, increment line number

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 44c28985fb8a09bea34c75bcb1d81e4928929175..6ad05addb69d403f288680b83a90a1132b376572 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2020-08-27  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       PR 26088
+       * mclex.c (skip_until_eol): If eol was found, increment line
+       number.
+
 2020-08-27  Nick Alcock  <nick.alcock@oracle.com>
 
        * objdump.c (dump_ctf_errs): Unquote CTF error messages.

diff --git a/binutils/mclex.c b/binutils/mclex.c
index da8bfb513112679949f055c4dbca66b4ace3ebd4..0cf85eeddd454a9bb1beda95a5b4d0d07c77949e 100644 (file)
--- a/binutils/mclex.c
+++ b/binutils/mclex.c
@@ -334,7 +334,10 @@ skip_until_eol (void)
   if (input_stream_pos[0] == 0)
     return 0;
   if (input_stream_pos[0] == '\n')
-    ++input_stream_pos;
+    {
+      ++input_stream_pos;
+      input_line += 1;
+    }
   return 1;
 }