Bug 1297644 - Cherry-pick upstream fix for misleading-indent/missing-brace bug. r=nical
authorJonathan Kew <jkew@mozilla.com>
Mon, 19 Sep 2016 10:41:27 +0100
changeset 314392 20fd10d6ef21ef4aa43b88006adf4f4f61d55249
parent 314391 cc2cbca41195523582e22a3677bce09820c05d3c
child 314393 4193ef8a247ed85cbb1c9c24f7ba84c40222143b
push id20571
push userkwierso@gmail.com
push dateMon, 19 Sep 2016 22:56:59 +0000
treeherderfx-team@671c2af548b2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1297644
milestone51.0a1
Bug 1297644 - Cherry-pick upstream fix for misleading-indent/missing-brace bug. r=nical
gfx/graphite2/src/Face.cpp
--- a/gfx/graphite2/src/Face.cpp
+++ b/gfx/graphite2/src/Face.cpp
@@ -326,20 +326,22 @@ Error Face::Table::decompress()
     {
     case NONE: return e;
 
     case LZ4:
     {
         uncompressed_size  = hdr & 0x07ffffff;
         uncompressed_table = gralloc<byte>(uncompressed_size);
         if (!e.test(!uncompressed_table || uncompressed_size < 4, E_OUTOFMEM))
+        {
             memset(uncompressed_table, 0, 4);   // make sure version number is initialised
             // coverity[forward_null : FALSE] - uncompressed_table has been checked so can't be null
             // coverity[checked_return : FALSE] - we test e later
             e.test(lz4::decompress(p, _sz - 2*sizeof(uint32), uncompressed_table, uncompressed_size) != signed(uncompressed_size), E_SHRINKERFAILED);
+        }
         break;
     }
 
     default:
         e.error(E_BADSCHEME);
     };
 
     // Check the uncompressed version number against the original.