From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 21 Sep 2011 20:17:56 +0000 (-0700)
Subject: * ftfont.c (ftfont_shape_by_flt): Add lint_assume to pacify GCC 4.6.1 x86-64.
X-Git-Tag: emacs-24.2.90~471^2~6^2~205
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=537775e84d41ffa9ea944661a786a3c3aace1c3b;p=emacs.git

* ftfont.c (ftfont_shape_by_flt): Add lint_assume to pacify GCC 4.6.1 x86-64.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 382ca0f4e25..cc0918e6030 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -178,6 +178,7 @@
 	(Frem): Don't assume arg is nonnegative.
 	* dbusbind.c (xd_append_arg): Check for integers out of range.
 	(Fdbus_call_method): Don't overflow the timeout int.
+
 	* dired.c (directory_files_internal, file_name_completion, scmp)
 	(file_name_completion_stat):
 	Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts.
@@ -332,7 +333,6 @@
 	Check that fixnums are in proper range for system types.
 	(ftfont_shape_by_flt):
 	Use ptrdiff_t, not EMACS_INT, where ptrdiff_t is wide enough.
-	Remove no-longer-needed lint_assume.
 	* gnutls.c (emacs_gnutls_write, emacs_gnutls_read):
 	Use ptrdiff_t, not EMACS_INT, where ptrdiff_t is wide enough.
 	(Fgnutls_error_fatalp, Fgnutls_error_string, Fgnutls_boot):
diff --git a/src/ftfont.c b/src/ftfont.c
index 5f8dbb4d455..9da4a98d692 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2416,6 +2416,7 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
     }
 
   len = i;
+  lint_assume (len <= STRING_BYTES_BOUND);
 
   if (with_variation_selector)
     {