[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-buffer-private.hh |    2 +-
 test/fuzzing/Makefile.am |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a6d7668a954a763a053f8af8edbff4731aa43729
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Nov 6 09:46:54 2015 -0800

    [fuzzing] Cap max buffer len at 128

diff --git a/test/fuzzing/Makefile.am b/test/fuzzing/Makefile.am
index 22e7a12..e5ea3a8 100644
--- a/test/fuzzing/Makefile.am
+++ b/test/fuzzing/Makefile.am
@@ -41,6 +41,7 @@ hb_fuzzer_CPPFLAGS = \
 	-DHB_SANITIZE_MAX_EDITS=3 \
 	-DHB_BUFFER_MAX_EXPANSION_FACTOR=3 \
 	-DHB_BUFFER_MAX_LEN_MIN=8 \
+	-DHB_BUFFER_MAX_LEN_DEFAULT=128 \
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
commit f1c4adbcd3f6275e81e118ddadc9396f82daeccf
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Nov 6 09:46:05 2015 -0800

    Fix typo

diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index 0ffb60d..67c431d 100644
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -41,7 +41,7 @@
 #ifndef HB_BUFFER_MAX_LEN_MIN
 #define HB_BUFFER_MAX_LEN_MIN 8192
 #endif
-#ifndef HB_BUFFER_MAX_LEN_DEFAULT_
+#ifndef HB_BUFFER_MAX_LEN_DEFAULT
 #define HB_BUFFER_MAX_LEN_DEFAULT 0x3FFFFFFF /* Shaping more than a billion chars? Let us know! */
 #endif