* 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 382ca0f4e2545a13ecde77119678ec21de0d7b52..cc0918e60306f0de865286c92bb186d11a545f39 100644 (file)
--- 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 5f8dbb4d45559c00dcb7944fba819cc8acbf364a..9da4a98d6924e30131a058d048e6eb202b2c235b 100644 (file)
--- 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)
     {