[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 util/hb-shape.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0afedaa96c81b63774a4a0ef9b4cb4995d24ec9e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 9 17:00:48 2014 -0400

    [util/hb-shape] Fix crash; oops

diff --git a/util/hb-shape.cc b/util/hb-shape.cc
index 324934a..01081ea 100644
--- a/util/hb-shape.cc
+++ b/util/hb-shape.cc
@@ -50,7 +50,7 @@ struct output_buffer_t
       output_format = hb_buffer_serialize_format_from_string (options.output_format, -1);
     /* An empty "output_format" parameter basically skips output generating.
      * Useful for benchmarking. */
-    if (*options.output_format &&
+    if ((!options.output_format || *options.output_format) &&
 	!hb_buffer_serialize_format_to_string (output_format))
     {
       if (options.explicit_output_format)