Index: wp-includes/wp-db.php
===================================================================
--- wp-includes/wp-db.php	(revision 17206)
+++ wp-includes/wp-db.php	(working copy)
@@ -1048,7 +1048,7 @@
 	<li>Are you sure that the database server is running?</li>
 </ul>
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
-"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
+"/*/WP_I18N_DB_CONN_ERROR*/, htmlspecialchars( stripslashes( $this->dbhost ), ENT_QUOTES ) ), 'db_connect_fail' );
 
 			// If show errors is disabled then we need to die anyway as we don't have a working DB connection
 			// unless we're trying to test the initial connection, in which case setup-config.php will handle.