diff --git a/gas/ChangeLog b/gas/ChangeLog
index a1b434a1e1..170934edb8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-03  Mikkel Lauritsen  <renard@nospam.dk>
+
+	PR 4722
+	* app.c (do_scrub_chars <state 5>): Check for output buffer full
+	after memcpy.
+
 2007-07-02  Joseph Myers  <joseph@codesourcery.com>
 
 	* config/tc-mips.c (s_dtprelword, s_dtpreldword,
diff --git a/gas/app.c b/gas/app.c
index d7eb50926d..e5f177801f 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -550,6 +550,8 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
 		memcpy (to, from, len);
 		to += len;
 		from += len;
+		if (to >= toend)
+		  goto tofull;
 	      }
 	  }