From: Nathan Sidwell <nathan@codesourcery.com>
Date: Mon, 28 May 2007 19:32:58 +0000 (+0000)
Subject: 	* app.c (do_scrub_chars): Cope with \ at end of buffer.x
X-Git-Tag: binutils-2_18-branchpoint~634
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1740b7b1d54cee1dd19851fc47efa18e6d21d40e;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 95dfaa44dea..8d9483a1202 100644
--- 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 aa180044e7c..d7eb50926d2 100644
--- 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;