* app.c (do_scrub_chars): Cope with \ at end of buffer.x

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 95dfaa44deaa7ba00ee0e750d6686b4c0fc72dd1..8d9483a1202e7a671770759ff1d0f17a9357d16f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-28  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * app.c (do_scrub_chars): Cope with \ at end of buffer.
+
 2007-05-26  Alan Modra  <amodra@bigpond.net.au>
 
        * config/tc-ppc.c (ppc_insert_operand): Truncate sign bits in

diff --git a/gas/app.c b/gas/app.c
index aa180044e7c98bc5e1dd3c6292d2f97bd15b6abf..d7eb50926d2cf91621137725bea8afb57e4347d8 100644 (file)
--- a/gas/app.c
+++ b/gas/app.c
@@ -1360,7 +1360,15 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
                     the space.  We don't have enough information to
                     make the right choice, so here we are making the
                     choice which is more likely to be correct.  */
-                 PUT (' ');
+                 if (to + 1 >= toend)
+                   {
+                     /* If we're near the end of the buffer, save the
+                        character for the next time round.  Otherwise
+                        we'll lose our state.  */
+                     UNGET (ch);
+                     goto tofull;
+                   }
+                 *to++ = ' ';
                }
 
              state = 3;